1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Commit graph

140 commits

Author SHA1 Message Date
georgejhunt
db56e184d1
7.2 maps [OSM] (#2486)
* move scripts and assets

* webpack does not bundle externap -- not node -- modules

* change main.js to *-bundle for viewer, test-page, and installer

* disable the long download of osm for all versions of local_vars

* start nginx for OSM always

* let nodejs provide js packages

* move scripts and assets

* webpack does not bundle externap -- not node -- modules

* change main.js to *-bundle for viewer, test-page, and installer

* disable the long download of osm for all versions of local_vars

* start nginx for OSM always

* let nodejs provide js packages

* change soft coded pointers from test branch to master
2020-08-22 10:47:57 -07:00
georgejhunt
32348e58ef
Regions (#2480)
* missing link in mapli/assets for regions.json

* wrong target

* the download of regions.json was lost
2020-08-10 16:06:30 -07:00
georgejhunt
8090f3bb29
Stage1.5 [OSM] (#2473)
* change osm_branch to maps_branch. That is what it is

* wiki says stage1  does not include changes to maps/main.js

* get the map catalog from ukids

* skip bypass download if files are present

* add an init.json

* add in extend_sat

* first cut

* first errors

* put fonts in iiab font dir

* get the php tilesserve in place

* add tileserver.php

* add in search files

* fonts are available already

* Revert "fonts are available already"

This reverts commit c93a38a4ed99080ae5590abaffa8cf69196ed9dd.

* Create README.md

* put fonts back in

* getting ready to transfer to rpi

* move regions.json to test

* create the symlinks for viewer

* use wget

* deal with detail from regions.json

* reformat to IIAB for map tiles

* deleting z0-z9 takes 30min

* remove sleep

* transfer current state to hadron

* bump transition between white labels to black on sat style from 7 to 9

* added init.json to aggregate

* put regions.json in iiab map role

* get files from archive.org

* detail_url was wrong from update_regions.py

* get regions.json from iiab repo

* put regios.json where admin console needs it

* update details_url

* create yamls for osm

* fix typos in new yamls

* missing with_items clause

* put detail.mbtiles in ./tiles folder

* do the move from working to viewer

* choose the version which uses lib_adm

* first cut

* first errors

* put fonts in iiab font dir

* get the php tilesserve in place

* add tileserver.php

* add in search files

* fonts are available already

* Revert "fonts are available already"

This reverts commit c93a38a4ed99080ae5590abaffa8cf69196ed9dd.

* put fonts back in

* getting ready to transfer to rpi

* move regions.json to test

* create the symlinks for viewer

* use wget

* deal with detail from regions.json

* reformat to IIAB for map tiles

* deleting z0-z9 takes 30min

* remove sleep

* transfer current state to hadron

* bump transition between white labels to black on sat style from 7 to 9

* added init.json to aggregate

* put regions.json in iiab map role

* get files from archive.org

* detail_url was wrong from update_regions.py

* get regions.json from iiab repo

* put regios.json where admin console needs it

* update details_url

* create yamls for osm

* fix typos in new yamls

* missing with_items clause

* put detail.mbtiles in ./tiles folder

* install dir.php

* change docroot in tileserver.php

* Update README.md

* regions.json updated with 2019 data

* add mbtileinfo.php and put it in place

* changes to osm-fixup

* osm-fixup receive url

* typo in fixup and wronge mbtileinfo base

* sloppy mistakes arount found_region

* can use adm-lib.py

* change regions.json to map-catalog.json

* change regios.json to map-catalog.json, bump 2map-reorg to 3map-reorg as branch name

* another region->map

* call the console script to add menu items

* fetch test-page from test branch

* typo in osm-fixup.py comment

* remove the map_functions from test page

* new bboxes, title to san_jose

* remove the regions.json and map_functions.js

* let the map repo have all files related to test-page

* first cut

* first errors

* put fonts in iiab font dir

* get the php tilesserve in place

* add tileserver.php

* add in search files

* start debugging

* fonts are available already

* Revert "fonts are available already"

This reverts commit c93a38a4ed99080ae5590abaffa8cf69196ed9dd.

* Create README.md

* put fonts back in

* getting ready to transfer to rpi

* move regions.json to test

* create the symlinks for viewer

* use wget

* deal with detail from regions.json

* reformat to IIAB for map tiles

* deleting z0-z9 takes 30min

* remove sleep

* transfer current state to hadron

* bump transition between white labels to black on sat style from 7 to 9

* added init.json to aggregate

* put regions.json in iiab map role

* get files from archive.org

* detail_url was wrong from update_regions.py

* get regions.json from iiab repo

* put regios.json where admin console needs it

* update details_url

* create yamls for osm

* fix typos in new yamls

* missing with_items clause

* put detail.mbtiles in ./tiles folder

* do the move from working to viewer

* these moves work

* first cut

* first errors

* put fonts in iiab font dir

* get the php tilesserve in place

* add tileserver.php

* add in search files

* start debugging

* fonts are available already

* Revert "fonts are available already"

This reverts commit c93a38a4ed99080ae5590abaffa8cf69196ed9dd.

* put fonts back in

* getting ready to transfer to rpi

* move regions.json to test

* create the symlinks for viewer

* use wget

* deal with detail from regions.json

* reformat to IIAB for map tiles

* deleting z0-z9 takes 30min

* remove sleep

* transfer current state to hadron

* bump transition between white labels to black on sat style from 7 to 9

* added init.json to aggregate

* put regions.json in iiab map role

* get files from archive.org

* detail_url was wrong from update_regions.py

* get regions.json from iiab repo

* put regios.json where admin console needs it

* update details_url

* create yamls for osm

* fix typos in new yamls

* missing with_items clause

* put detail.mbtiles in ./tiles folder

* install dir.php

* change docroot in tileserver.php

* Update README.md

* regions.json updated with 2019 data

* add mbtileinfo.php and put it in place

* changes to osm-fixup

* osm-fixup receive url

* typo in fixup and wronge mbtileinfo base

* sloppy mistakes arount found_region

* can use adm-lib.py

* change regions.json to map-catalog.json

* change regios.json to map-catalog.json, bump 2map-reorg to 3map-reorg as branch name

* another region->map

* call the console script to add menu items

* fetch test-page from test branch

* typo in osm-fixup.py comment

* remove the map_functions from test page

* new bboxes, title to san_jose

* remove the regions.json and map_functions.js

* let the map repo have all files related to test-page

* add css

* get nginx /maps working

* helps admin console work with osm-maps

* point to the stage1 branch in maps

* add bypass

* pull from map repo from a branch that is controlled by a variable

* somehow this install was missing php-sqlite

* add init.json

* change osm_branch to maps_branch. That is what it is

* wiki says stage1  does not include changes to maps/main.js

* get the map catalog from ukids

* skip bypass download if files are present

* let osm_enalbled control world to zoom 10

* expand bypass to install-map-region

* lots of errors in download script

* both are modified

* need python to write init.json - but bash workds

* add in make_init.py

* init.json updated via python

* get the installer mbtiles

* change to map branch staage1

* add tileserve.php to installer

* put style-osm.json in installer

* create a link for planet in installer

* turn off enable in local_vars for osm-vector-maps

* copy scripts to /usr/bin

* softcode satellite fname

* typos

* sat_dir needed work

* standatdize output satellite mbtile name

* sat_bboxes not defined

* period to comma in sat_bboxes

* too many errors--did this ever work

* period to comma

* move new file into place, save old to /tmp

* cannot move to /tmp from root -- different filesystem.  So use copy

* add iiab-summarize.sh to /usr/bin

* write init.json correctly

* only the web-pack from stage1 branch

* let installer use php

* point to maps rc-master

* partially working but with many missing pieces

* got on the wrong machine

* got through it once with pages in rc-master

* add installer_functions to install.yml

* spell installer_functions with a .js

* need tileserver.php for installer

* colorize the map list for installed tiles

* add s to iiab-maps-finish.py

* get the name correct for iiab-maps-finish.py

* map->maps, add python3-pil

* iiab-extend-sat much better, maybe good enouth

* start work on README

* Update README.md

* move README.md up oe level

* change default map page to installer

* working on test-page redirect

* create assets in test-page

* get the installer redirect working

* can now record satellite download info in database -- needs improvement in bounds

* hyphen/underebar problem installer-functions.js

* change rc-master to master

* eliminate aggregate.py, dir.php, create_empty_mbtiles.sh

* move assets from iiab to maps

* removed dead wood and did get_url for map stuff

* extra space in with_items clause after hyphen caused errors

* keep stuff in main.yml I do not understand

* last vestiges of maps in iiab repo

* after runroles, nginx needs restarting

* remove dead wood, pull redirect for maplist from maps repo

* observe iiab standards

* remove redundant code

* get nginx box/maps to work

* fonts moved, so the pointers must change

* enabled => true in all
2020-08-10 12:02:58 -07:00
Jerry Vonau
1957993435 OSM- ensure php{{ php_version }}-sqlite3 is installed 2020-07-07 12:59:43 -05:00
Tim Moody
0e67f5ed9b centralize map catalog for use by osm and admin console 2020-04-19 13:26:06 -04:00
Tim Moody
c3fde8d903 remove any possible file before creating regions symlink 2020-04-10 13:53:40 -04:00
root
810fc81ac8 Convert dest: to path: per Ansible lineinfile norms 2020-02-03 19:54:04 -05:00
root
5f8004c126 rm enable-or-disable.yml.deprecated 2020-02-01 18:39:51 -05:00
root
413ff01132 Cleaner Gitea playbook + 2 tasks/main.yml's 2020-02-01 18:20:22 -05:00
root
2cdf846365 Remove tags in ~30 files, improve verbiage 2020-01-30 04:57:53 -05:00
root
814efd5a02 Mostly var cleanup across ~80 files 2020-01-30 04:00:00 -05:00
A Holt
7ce7e7f9bf
osm-vector-maps/tasks/nginx.yml 2020-01-29 08:52:31 -05:00
root
7252761b8f Variable Validation: improved error messages 2020-01-28 07:35:33 -05:00
A Holt
b0558bb769
Cleaner osm-vector-maps/tasks/install.yml 2020-01-27 02:49:13 -05:00
A Holt
3d02197d54
Save osm-vector-maps vars to /etc/iiab/iiab.ini 2020-01-27 02:30:27 -05:00
A Holt
33f28fb3d9
Cleaner osm-vector-maps/tasks/main.yml 2020-01-27 02:20:46 -05:00
A Holt
2fc24a70c8
Cleaner osm-vector-maps/tasks/install.yml 2020-01-27 02:01:55 -05:00
A Holt
5e3a0e7f34
Update osm-vector-maps-nginx.conf.j2 2020-01-27 01:49:00 -05:00
A Holt
0b368bb64d
Update osm-vector-maps/tasks/install.yml 2020-01-27 01:27:46 -05:00
A Holt
a8c3261cdd
Update enable-or-disable.yml.deprecated 2020-01-27 01:26:22 -05:00
A Holt
4b254dc48c
Rename test-index.redirect.deprecated to test-index.redirect 2020-01-27 01:25:38 -05:00
A Holt
96dd134e9c
Update osm-vector-maps-nginx.conf.j2 2020-01-27 01:14:19 -05:00
A Holt
68afc3205b
Cleaner osm-vector-maps/tasks/install.yml 2020-01-27 01:09:50 -05:00
A Holt
92b475210b
Softcode osm-vector-maps/templates/osm-vector-maps-nginx.conf 2020-01-27 00:58:41 -05:00
A Holt
1c275cb88c
Clean osm-vector-maps/tasks/nginx.yml 2020-01-27 00:58:15 -05:00
A Holt
9d08666e1a
Update and rename test-index.redirect to test-index.redirect.deprecated 2020-01-27 00:57:39 -05:00
A Holt
3460ff3e84
Update & Rename osm-vector-maps/tasks/enable-or-disable.yml to enable-or-disable.yml.deprecated 2020-01-27 00:57:22 -05:00
A Holt
696c15e06f
Update osm-vector-maps/tasks/install.yml 2020-01-27 00:56:47 -05:00
A Holt
e61230c817
Update osm-vector-maps/tasks/main.yml 2020-01-27 00:56:31 -05:00
Jerry Vonau
1f156d55f7 index order? 2020-01-26 05:12:42 -06:00
Jerry Vonau
baaa17f6bb osm split 2020-01-26 05:12:42 -06:00
root
b7151fe047 Rename var nginx_config_dir to nginx_conf_dir 2020-01-24 01:08:42 -05:00
A Holt
ed2de9f35d
'osm_vector_maps_installed: True' for /etc/iiab/iiab_state.yml 2020-01-17 23:50:31 -05:00
A Holt
4adf4ebd6c
Update osm-vector-maps/tasks/main.yml 2020-01-11 15:22:52 -05:00
Jerry Vonau
07996d87b9 osm_v_m - softcode nginx_config_dir, adjust reload for nginx 2020-01-10 12:35:35 -06:00
Tim Moody
35ac04ea3b fix glitch in osm-vector-maps-nginx.conf 2019-12-29 13:41:34 -05:00
George Hunt
eea868b891 include a php clause in nginx conf 2019-12-10 20:52:10 +00:00
Tim Moody
366d893a04 and - not _ 2019-11-29 16:41:10 -05:00
Tim Moody
ae8269f37d and map not maps 2019-11-29 14:34:57 -05:00
Tim Moody
cd922a6f52 menus to maps 2019-11-29 14:22:51 -05:00
Tim Moody
ddfd03b8e6 cmdsrv scripts dir is not defined until adm cons runs
hard code for now
2019-11-29 10:40:50 -05:00
Tim Moody
913cae3d67 install bash script 2019-11-29 10:34:52 -05:00
Tim Moody
bb3c6174f1 only put bash script here. update-menus in Adm Cons 2019-11-29 10:25:06 -05:00
Tim Moody
edaecab6c6 upgrade to restructured scripts 2019-11-29 09:16:29 -05:00
Jerry Vonau
99ce889308 iiab-update-map - pylint3 says unused 2019-11-28 05:39:24 -06:00
Jerry Vonau
7a1b41649d iiab-update-map - print (), python3 2019-11-28 05:39:24 -06:00
George Hunt
cffb6afecc oversignts and corrections -- most now seem to work on rpi 2019-11-28 05:23:13 -06:00
A Holt
4f77d651ce
For now, keep python-geojson on OS's prior to Ubuntu 19.10 2019-10-19 09:55:05 -04:00
A Holt
3f3e313b8d
Clarify python3-geojson in osm-vector-maps/tasks/main.yml 2019-10-14 17:20:40 -04:00
A Holt
466a324a87
osm-vector-maps: use python3-geojson (python-geojson no longer avail on Ubuntu 19.10) 2019-10-14 15:55:01 -04:00
A Holt
397ba70138
19 levels of zoom from 0-18 2019-07-23 16:54:27 -04:00
A Holt
04a6494d04
osm-vector-maps playbook: reload Apache at end 2019-07-07 22:19:02 -04:00
A Holt
e7d1e1ce33
Create README.md 2019-07-07 22:08:09 -04:00
A Holt
5e0ecc9fac
Update osm-vector-maps.conf 2019-07-07 22:02:06 -04:00
A Holt
dd26712193
Enable http://box/map too 2019-07-07 22:00:46 -04:00
A Holt
5f75c3409f
Tighten up PR #1834 2019-07-07 21:47:01 -04:00
A Holt
75ea18803b
when: not osm_redirect.stat.exists 2019-07-07 21:30:13 -04:00
A Holt
ea704596d1
typo: osm-redirect -> osm_redirect 2019-07-07 21:28:48 -04:00
A Holt
c51225cdba
Don't clobber http://box/maps redirect if it exists! 2019-07-07 21:21:21 -04:00
A Holt
fef93996b1
Describe /usr/bin/iiab-update-map 2019-07-06 14:07:50 -04:00
A Holt
efcac138ef
1m & 1km details are often visible, don't sell us short! 2019-07-06 13:50:10 -04:00
A Holt
3d7a5d7ebd
better Map Pack descriptions, building on PR #1823 2019-07-06 13:09:03 -04:00
A Holt
47d4462789
iiab-update-map description & extra_description 2019-07-06 10:20:06 -04:00
A Holt
beacfa0c8e
Update main.yml 2019-06-29 14:23:00 -04:00
A Holt
153a231184
Update main.yml 2019-06-28 19:12:48 -04:00
A Holt
2de51c5229
Update main.yml 2019-06-28 18:59:05 -04:00
A Holt
d5549e7941
Moved to repo iiab/iiab-admin-console 2019-06-26 12:03:56 -04:00
A Holt
fc82097f88
Update en-map_test.json 2019-06-26 12:00:52 -04:00
George Hunt
3ea3bccdd8 adjustments to redirect 2019-06-05 19:43:21 -07:00
George Hunt
b3771fba39 write index.html redirect 2019-06-05 18:53:05 -07:00
Tim Moody
b98e23eeed skip unknown map regions 2019-05-31 18:56:19 -04:00
A Holt
33b8c06f57
Merge pull request #1683 from georgejhunt/register-map
Register map
2019-05-19 21:10:05 -04:00
George Hunt
9a899b4314 remove debug print statement 2019-05-19 17:12:49 -07:00
George Hunt
3ca7b266cc Merge branch 'register-map' of https://github.com/georgejhunt/iiab into register-map 2019-05-19 17:07:28 -07:00
George Hunt
a5088f063d permit omt and sat to be used in filename 2019-05-19 17:07:01 -07:00
Tim Moody
8678280551 various fixes 2019-05-19 12:53:55 -04:00
George Hunt
7eae142a62 use regular expressions to break apart filename 2019-05-17 21:53:57 -07:00
George Hunt
abc8fb8947 replace extract_region_from_filename- use re 2019-05-17 19:09:53 -07:00
Tim Moody
fadba3c7b3 handle first time when idx file does not exist 2019-05-13 14:23:14 -04:00
Tim Moody
45769b15b8 don't add to menu unless new 2019-05-13 14:02:25 -04:00
Tim Moody
1bd4ac5fba don't write file to menu def 2019-05-11 13:01:03 -04:00
Tim Moody
c9e6c2103d change auto generate reference 2019-05-11 12:05:18 -04:00
Tim Moody
a055d75686 missed the / 2019-05-11 10:30:02 -04:00
Tim Moody
6947369023 name change 2019-05-11 10:21:31 -04:00
A Holt
c2b324fc5d
Comment map_fuctions.js -> map_functions.js thanks to @floydianslips 2019-05-09 13:09:34 -04:00
A Holt
25fa8a8ce9
Update main.yml 2019-05-09 12:17:37 -04:00
A Holt
5489fd238d
Update main.yml 2019-05-09 12:16:21 -04:00
A Holt
046e649ec5
Update main.yml 2019-05-09 12:15:00 -04:00
George Hunt
84220ddbb7 apache conf file 2019-05-06 07:32:09 -07:00
George Hunt
612032da31 change directory name 2019-05-06 07:29:44 -07:00