1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 19:52:06 +00:00
Commit graph

38 commits

Author SHA1 Message Date
root
0cd7ccc816 CUPS: Fix box/print URLs, Secure box/print/admin URLs, Lint NGINX .conf's 2021-07-12 15:52:15 -04: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
A Holt
5e3a0e7f34
Update osm-vector-maps-nginx.conf.j2 2020-01-27 01:49:00 -05:00
A Holt
96dd134e9c
Update osm-vector-maps-nginx.conf.j2 2020-01-27 01:14:19 -05:00
A Holt
92b475210b
Softcode osm-vector-maps/templates/osm-vector-maps-nginx.conf 2020-01-27 00:58:41 -05: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
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
397ba70138
19 levels of zoom from 0-18 2019-07-23 16:54:27 -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
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
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
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
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
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