From 988e6a83dac74e3aad25ad43758580318adbf094 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 16:33:41 +0100 Subject: [PATCH 1/9] Start separating Makefiles for Linux and MacOS. --- searender/{Makefile => Makefile.linux} | 0 searender/Makefile.macos | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) rename searender/{Makefile => Makefile.linux} (100%) create mode 100644 searender/Makefile.macos diff --git a/searender/Makefile b/searender/Makefile.linux similarity index 100% rename from searender/Makefile rename to searender/Makefile.linux diff --git a/searender/Makefile.macos b/searender/Makefile.macos new file mode 100644 index 0000000..b4e0024 --- /dev/null +++ b/searender/Makefile.macos @@ -0,0 +1,20 @@ +CFLAGS=-std=c99 + +all: s57toosm searender + +s57toosm: s57toosm.o s57obj.o s57att.o s57val.o + cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o -liconv + +searender: searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o + cc -o searender searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o -liconv + +s57toosm.o: s57toosm.c map.h s57obj.h s57att.h s57val.h +searender.o: searender.c map.h render.h rules.h s57obj.h s57att.h s57val.h + +map.o: map.c map.h s57val.h +render.o: render.c render.h map.h render.h s57val.h +rules.o: rules.c rules.h map.h render.h s57obj.h s57att.h s57val.h +s57obj.o: s57obj.c s57obj.h +s57att.o: s57att.c s57obj.h s57att.h +s57val.o: s57val.c s57obj.h s57att.h s57val.h + From fa63db1657ca28dc0d694fe52ad3c971bc72a01e Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 16:38:36 +0100 Subject: [PATCH 2/9] Add "clean" target. --- searender/Makefile.linux | 5 +++++ searender/Makefile.macos | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/searender/Makefile.linux b/searender/Makefile.linux index b4e0024..322ada7 100644 --- a/searender/Makefile.linux +++ b/searender/Makefile.linux @@ -1,7 +1,12 @@ +.PHONY: clean + CFLAGS=-std=c99 all: s57toosm searender +clean: + rm -vf *.o s57toosm searender + s57toosm: s57toosm.o s57obj.o s57att.o s57val.o cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o -liconv diff --git a/searender/Makefile.macos b/searender/Makefile.macos index b4e0024..322ada7 100644 --- a/searender/Makefile.macos +++ b/searender/Makefile.macos @@ -1,7 +1,12 @@ +.PHONY: clean + CFLAGS=-std=c99 all: s57toosm searender +clean: + rm -vf *.o s57toosm searender + s57toosm: s57toosm.o s57obj.o s57att.o s57val.o cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o -liconv From 2bddc3d12a981767cc6101b38ef157cbc6c9cc34 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 16:41:55 +0100 Subject: [PATCH 3/9] GCC (at least on Linux) requires "gnu99" instead of "c99". --- searender/Makefile.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searender/Makefile.linux b/searender/Makefile.linux index 322ada7..72f9034 100644 --- a/searender/Makefile.linux +++ b/searender/Makefile.linux @@ -1,6 +1,6 @@ .PHONY: clean -CFLAGS=-std=c99 +CFLAGS=-std=gnu99 all: s57toosm searender From 68d863a8adfe17364beccaa0282224ebf52de7c4 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 16:43:07 +0100 Subject: [PATCH 4/9] Compiling fails with "-liconv" on Linux. --- searender/Makefile.linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searender/Makefile.linux b/searender/Makefile.linux index 72f9034..2954014 100644 --- a/searender/Makefile.linux +++ b/searender/Makefile.linux @@ -8,10 +8,10 @@ clean: rm -vf *.o s57toosm searender s57toosm: s57toosm.o s57obj.o s57att.o s57val.o - cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o -liconv + cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o searender: searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o - cc -o searender searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o -liconv + cc -o searender searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o s57toosm.o: s57toosm.c map.h s57obj.h s57att.h s57val.h searender.o: searender.c map.h render.h rules.h s57obj.h s57att.h s57val.h From f1258c29debb3651f1e7c53a40a76401a6a7e496 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 16:43:57 +0100 Subject: [PATCH 5/9] Math functions (sin, cos, sqrt) require "-lm" on Linux GCC. --- searender/Makefile.linux | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/searender/Makefile.linux b/searender/Makefile.linux index 2954014..994c79d 100644 --- a/searender/Makefile.linux +++ b/searender/Makefile.linux @@ -10,8 +10,10 @@ clean: s57toosm: s57toosm.o s57obj.o s57att.o s57val.o cc -o s57toosm s57toosm.o s57obj.o s57att.o s57val.o +# ATTENTION: the "-lm" flag for gcc IS ABSOLUTELY REQUIRED to be placed AFTER +# the code/object files, see http://wiki.debian.org/ToolChain/DSOLinking searender: searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o - cc -o searender searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o + cc -o searender searender.o map.o render.o rules.o s57obj.o s57att.o s57val.o -lm s57toosm.o: s57toosm.c map.h s57obj.h s57att.h s57val.h searender.o: searender.c map.h render.h rules.h s57obj.h s57att.h s57val.h From e0b21963a6a839612f13beb7c4b8ea78c00e8fcb Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 17:29:23 +0100 Subject: [PATCH 6/9] Add .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e573ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# vim swap files +.*.sw? + +*.o +searender/searender +searender/s57toosm From dcb525e8e2753eb45e4666d7990028ec991b4f71 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 17:44:49 +0100 Subject: [PATCH 7/9] Ignore OSM files. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2e573ac..f4f35ee 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ *.o searender/searender searender/s57toosm + +# all osm files +*.osm From c1584037cb92b5350dcd8201fcbc94f58231a1b7 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 17:39:10 +0100 Subject: [PATCH 8/9] Whitespace only (newline at EOF). --- searender/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searender/render.c b/searender/render.c index 3ed176d..8d18517 100644 --- a/searender/render.c +++ b/searender/render.c @@ -1354,4 +1354,4 @@ char *charString(Item_t *item, char *type, int idx) { default: break; } return string1; -} \ No newline at end of file +} From a3014f348a04a7b515b10facdc423fb3dab99d5e Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter Date: Sun, 30 Nov 2014 17:42:11 +0100 Subject: [PATCH 9/9] Add "getworld" that is using the online Overpass variant. --- sports/getworld.remoteoverpass | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 sports/getworld.remoteoverpass diff --git a/sports/getworld.remoteoverpass b/sports/getworld.remoteoverpass new file mode 100755 index 0000000..269fd5b --- /dev/null +++ b/sports/getworld.remoteoverpass @@ -0,0 +1,35 @@ +#!/bin/bash + +# should need around 30 minutes per run (20141131) +while true; do + # twice a day extract types and + cat types.txt | while read type; do + touch sort.osm + while [ -e sort.osm ]; do + # get all matching nodes from Overpass + wget -O xapi.osm http://overpass.osm.rambler.ru/cgi/xapi?*[$type][@meta] + # put found nodes into sort.osm + if ~/bin/osmosis -q --rx file=xapi.osm --s --wx file=sort.osm 2> /dev/null; then + rm xapi.osm + if [ -e merge.osm ]; then + # check for differences to supress doubles and append them + ~/bin/osmosis -q --rx file=merge.osm --rx file=sort.osm --m --wx file=tmp.osm 2> /dev/null + mv tmp.osm merge.osm + rm sort.osm + else + # create new + mv sort.osm merge.osm + fi + else + touch sort.osm + fi + done + done + mv merge.osm next.osm +done + +# send the next.osm to the rendering server (i.e. echo as of 20141131) +#rsync push to echo +# rsync -rvz -e 'ssh -i ../Access/alexej-openssh-priv.txt -p 22001' next.osm alexej@213.95.21.157:sports-renderer/ +# sleep for half a day +# sleep 43200