update to new versions

8cH9azbsFifZ · Aug 10, 2023 · 3d0ce4b · 3d0ce4b
1 parent 2d6309e
commit 3d0ce4b
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,11 @@
+- Version 0.14 baseline: compatibility with cavemap-script
+- Version 0.13 baseline: cleanup poi merge
+- Version 0.12 baseline: cave poi rendering works
+- Version 0.11 baseline: fenix 6 typ works
+- Version 0.10 baseline: opentopomap works
+- Version 0.9 baseline: docker-compose up >> rlp maps created for basecamp and garmin in ./maps
+- Version 0.8 baseline with workflow fzk: rlp
+- Version 0.7 baseline with working bootstrap: bounds & sea
+- Version 0.6 baseline with working fzk dev
+- Version 0.4 starts merge with fzk development entvironment
+- Version up to 0.3 works with Makefile (cf. docu in makefile itself)
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,13 @@
 FROM debian
 
-MAINTAINER Gerolf Ziegenhain <[email protected]>
+RUN apt-get update && apt-get -y install python3-pip gpsbabel osmctools wget curl rsync vim unzip default-jre nsis zip less python3-cycler python3-gdal python3-pyparsing python3-matplotlib  python3-bs4 python3-lxml python3-numpy
+#
+#RUN pip3 install python3-http python3-cookiejar python3-request
 
-RUN apt-get update
-RUN apt-get -y install python3-pip gpsbabel osmctools 
-RUN pip3  install cycler pyparsing matplotlib http cookiejar bs4 lxml request
 
-#RUN wget http://katze.tfiu.de/projects/phyghtmap/phyghtmap_2.20.orig.tar.gz
 ADD install /install
-RUN cd /tmp ; tar xzf /install/phyghtmap_2.20.orig.tar.gz ; cd phyghtmap-2.20 ; python setup.py install
+RUN dpkg -i /install/phyghtmap_2.23-1_all.deb
 
-RUN apt-get -y install wget curl rsync vim unzip default-jre nsis zip less
 
 # Store garmin scripts
 RUN mkdir -p /opt/garmin

diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 VER=0.15
 build:
 	docker build . -t asdlfkj31h/garmin-opentopo:${VER} -t asdlfkj31h/garmin-opentopo:latest
-push:
-	docker push asdlfkj31h/garmin-opentopo:${VER}
-	docker push asdlfkj31h/garmin-opentopo:latest
+
 run:
+	docker-compose up -d
 	docker-compose run mt bash
 #	docker run -it --rm asdlfkj31h/garmin-opentopo:latest bash
 
 clean:
+	docker-compose down -v
 	rm TileCache/*
 	rm -rf maps/Freizeitkarte_RHEINLAND-PFALZ.gmap
diff --git a/README.md b/README.md
@@ -10,25 +10,21 @@
 ![Example map](doc/example.png)
 
 # Installation
-
-## Requirements
-- Docker 
-- at least 2 GB memory
-- at least 5 GB hdd storage
-
-## Time
-*Status*: WIP...
-
-germany Total time taken: 1 hour 48 minutes 3 seconds
+- Requirements: at least 2 GB memory, at least 5 GB hdd storage
+- Runtime: germany Total time taken: 1 hour 48 minutes 3 seconds
 
 
 ## Running the tool
+
 *Status*: WIP...
 
++ Build using: `make build``
++ Initialize using `docker-compose up``
++ Wait for initial setup to complete
++ Enter commandline and continue 
+
 
-    make build
-    docker-compose up
-    make run
+    docker-compose run mt bash
     /opt/garmin/bin/24_merge_elevation.sh
     /opt/garmin/bin/32_render_map.sh
 
@@ -39,46 +35,28 @@ TBD: adjust POI source file with environment variables
     /opt/garmin/bin/32_render_map.sh
 
 
-## Todo
-- move lib to install
-- move in garmin dir (container)
-- Better icon for 
-- Multiple POI files support
-
-
-## References
-- OpenTopoMap style: [OpenTopoMap](https://github.com/der-stefan/OpenTopoMap) 
-- Input for style definitions: [MKGMAP Hiking](https://github.com/vibrog/mkgmap-hiking) 
-- [OSMCONVERT](http://m.m.i24.cc/osmconvert.c)
-- [MKGMAP](http://www.mkgmap.org.uk/download/mkgmap.html) and its [SPLITTER](http://www.mkgmap.org.uk/download/splitter.html)
-- [phyghtmap](http://katze.tfiu.de/projects/phyghtmap/)
-- SRTM OSM data [Bike Extract SRTM OSM](https://extract.bbbike.org/)
-- Freizeitkarte development environment [github](https://github.com/freizeitkarte/fzk-mde-garmin)
-- Garmin Fenix 6 style files [github](https://github.com/ahotzler/garmin-fenix-6x-outdoor-typfile-AH)
-
-
 ## Howto adjust style
 *Status*: WIP...
 
 - Which points to show in which zoom level? style/opentopomap/points
 - Icons in XPM style/typ/OpenTopoMap.typ
 
+
 # Licenses
 - This module: GPL
-Merged contents (cf. the references):
+- Merged contents (cf. the references):
 - (c) Map: FZK project (free for private use)
 - Map data: OpenStreetMap contributors
 - Contour data: U.S. Geological Survey or J. de Ferranti
 
-# Releases
-- Version 0.14 baseline: compatibility with cavemap-script
-- Version 0.13 baseline: cleanup poi merge
-- Version 0.12 baseline: cave poi rendering works
-- Version 0.11 baseline: fenix 6 typ works
-- Version 0.10 baseline: opentopomap works
-- Version 0.9 baseline: docker-compose up >> rlp maps created for basecamp and garmin in ./maps
-- Version 0.8 baseline with workflow fzk: rlp
-- Version 0.7 baseline with working bootstrap: bounds & sea
-- Version 0.6 baseline with working fzk dev
-- Version 0.4 starts merge with fzk development entvironment
-- Version up to 0.3 works with Makefile (cf. docu in makefile itself)
+
+# References
+- OpenTopoMap style: [OpenTopoMap](https://github.com/der-stefan/OpenTopoMap) 
+- Input for style definitions: [MKGMAP Hiking](https://github.com/vibrog/mkgmap-hiking) 
+- [OSMCONVERT](http://m.m.i24.cc/osmconvert.c)
+- [MKGMAP](http://www.mkgmap.org.uk/download/mkgmap.html) and its [SPLITTER](http://www.mkgmap.org.uk/download/splitter.html)
+- [phyghtmap](http://katze.tfiu.de/projects/phyghtmap/)
+- SRTM OSM data [Bike Extract SRTM OSM](https://extract.bbbike.org/)
+- Freizeitkarte development environment [github](https://github.com/freizeitkarte/fzk-mde-garmin)
+- Garmin Fenix 6 style files [github](https://github.com/ahotzler/garmin-fenix-6x-outdoor-typfile-AH)
+
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,5 @@
+## Todo
+- move lib to install
+- move in garmin dir (container)
+- Better icon for 
+- Multiple POI files support
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,3 +50,10 @@ services:
             - install:/opt/lib/fzk-mde-garmin-develop/Freizeitkarte-Entwicklung/install
             - work:/opt/lib/fzk-mde-garmin-develop/Freizeitkarte-Entwicklung/work        
             - poi:/opt/lib/fzk-mde-garmin-develop/Freizeitkarte-Entwicklung/poi:ro
+
+volumes:
+    bounds:
+    sea:
+    install:
+    work:
+    poi:
diff --git a/install/README.md b/install/README.md
@@ -0,0 +1,3 @@
+# Source: 
+- http://katze.tfiu.de/projects/phyghtmap/phyghtmap_2.23-1_all.deb
+http://katze.tfiu.de/projects/phyghtmap/#Download
diff --git a/install/phyghtmap_2.20.orig.tar.gz b/install/phyghtmap_2.20.orig.tar.gz
diff --git a/install/phyghtmap_2.23-1_all.deb b/install/phyghtmap_2.23-1_all.deb