From 2261b95a5209c0bf92b0ec6379d4cf8a88cd3aef Mon Sep 17 00:00:00 2001 From: NetzAG Halifax Date: Fri, 13 Nov 2015 15:46:46 +0100 Subject: [PATCH 1/4] fix file permissions 755 -> 644 --- helper.php | 0 images/custom_marker_help.png | Bin images/index.html | 0 index.html | 0 language/de-DE/de-DE.mod_osmod.ini | 0 language/de-DE/de-DE.mod_osmod.sys.ini | 0 language/en-GB/en-GB.mod_osmod.ini | 0 language/en-GB/en-GB.mod_osmod.sys.ini | 0 mod_osmod.php | 0 mod_osmod.xml | 0 tmpl/default.php | 0 tmpl/index.html | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 helper.php mode change 100755 => 100644 images/custom_marker_help.png mode change 100755 => 100644 images/index.html mode change 100755 => 100644 index.html mode change 100755 => 100644 language/de-DE/de-DE.mod_osmod.ini mode change 100755 => 100644 language/de-DE/de-DE.mod_osmod.sys.ini mode change 100755 => 100644 language/en-GB/en-GB.mod_osmod.ini mode change 100755 => 100644 language/en-GB/en-GB.mod_osmod.sys.ini mode change 100755 => 100644 mod_osmod.php mode change 100755 => 100644 mod_osmod.xml mode change 100755 => 100644 tmpl/default.php mode change 100755 => 100644 tmpl/index.html diff --git a/helper.php b/helper.php old mode 100755 new mode 100644 diff --git a/images/custom_marker_help.png b/images/custom_marker_help.png old mode 100755 new mode 100644 diff --git a/images/index.html b/images/index.html old mode 100755 new mode 100644 diff --git a/index.html b/index.html old mode 100755 new mode 100644 diff --git a/language/de-DE/de-DE.mod_osmod.ini b/language/de-DE/de-DE.mod_osmod.ini old mode 100755 new mode 100644 diff --git a/language/de-DE/de-DE.mod_osmod.sys.ini b/language/de-DE/de-DE.mod_osmod.sys.ini old mode 100755 new mode 100644 diff --git a/language/en-GB/en-GB.mod_osmod.ini b/language/en-GB/en-GB.mod_osmod.ini old mode 100755 new mode 100644 diff --git a/language/en-GB/en-GB.mod_osmod.sys.ini b/language/en-GB/en-GB.mod_osmod.sys.ini old mode 100755 new mode 100644 diff --git a/mod_osmod.php b/mod_osmod.php old mode 100755 new mode 100644 diff --git a/mod_osmod.xml b/mod_osmod.xml old mode 100755 new mode 100644 diff --git a/tmpl/default.php b/tmpl/default.php old mode 100755 new mode 100644 diff --git a/tmpl/index.html b/tmpl/index.html old mode 100755 new mode 100644 From 6b224fe909281f0c3f43a54bce9f7ce360930e0f Mon Sep 17 00:00:00 2001 From: NetzAG Halifax Date: Fri, 13 Nov 2015 15:55:21 +0100 Subject: [PATCH 2/4] add more zoom levels --- language/de-DE/de-DE.mod_osmod.ini | 2 +- language/en-GB/en-GB.mod_osmod.ini | 2 +- mod_osmod.xml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/language/de-DE/de-DE.mod_osmod.ini b/language/de-DE/de-DE.mod_osmod.ini index 7bee787..5f282c9 100644 --- a/language/de-DE/de-DE.mod_osmod.ini +++ b/language/de-DE/de-DE.mod_osmod.ini @@ -48,7 +48,7 @@ MOD_OSMOD_H_MAP="Karteneinstellungen" MOD_OSMOD_HEIGHT="Höhe der Karte" MOD_OSMOD_HEIGHT_DESC="in px" MOD_OSMOD_ZOOM="Zoomlevel" -MOD_OSMOD_ZOOM_DESC="1: Sehr weit weg, 18: ganz nah" +MOD_OSMOD_ZOOM_DESC="1: Sehr weit weg, 20: ganz nah" MOD_OSMOD_BASELAYER="Kartenstil" MOD_OSMOD_BASELAYER_DESC="Mapnik ist der Standardstil von OpenStreetMap." MOD_OSMOD_CUSTOMBASELAYER="Benutzerdefinierter Kartenstil" diff --git a/language/en-GB/en-GB.mod_osmod.ini b/language/en-GB/en-GB.mod_osmod.ini index 675fe03..f493c20 100644 --- a/language/en-GB/en-GB.mod_osmod.ini +++ b/language/en-GB/en-GB.mod_osmod.ini @@ -48,7 +48,7 @@ MOD_OSMOD_H_MAP="Map configuration" MOD_OSMOD_HEIGHT="Map height" MOD_OSMOD_HEIGHT_DESC="in px" MOD_OSMOD_ZOOM="Zoomlevel" -MOD_OSMOD_ZOOM_DESC="1: far awaly, 18: very close" +MOD_OSMOD_ZOOM_DESC="1: far awaly, 20: very close" MOD_OSMOD_BASELAYER="Map style" MOD_OSMOD_BASELAYER_DESC="Mapnik is the default style of OpenStreetMap." MOD_OSMOD_CUSTOMBASELAYER="Custom map style" diff --git a/mod_osmod.xml b/mod_osmod.xml index bf37aec..2069daf 100644 --- a/mod_osmod.xml +++ b/mod_osmod.xml @@ -62,6 +62,8 @@ + + From d4c705ab965e1b406939c1d1eca5d837f7c73177 Mon Sep 17 00:00:00 2001 From: NetzAG Halifax Date: Fri, 13 Nov 2015 16:03:09 +0100 Subject: [PATCH 3/4] format --- helper.php | 12 +- mod_osmod.xml | 298 +++++++++++++++++++++++++------------------------- 2 files changed, 155 insertions(+), 155 deletions(-) diff --git a/helper.php b/helper.php index 996b7ae..f02b03e 100644 --- a/helper.php +++ b/helper.php @@ -18,12 +18,12 @@ private static function wxh($string){ private static function imagery($bl, $style){ $return = ""; - if($bl == 'mapnikde') $return = 'Openstreetmap.de (CC-BY-SA)'; - else if($bl == 'stamenwater') $return = 'Stamen Design, CC BY 3.0'; - else if($bl == 'mapquest') $return = 'MapQuest'; - else if($bl == 'opentopomap') $return = 'OpenTopoMap (CC-BY-SA), SRTM'; - else if($bl == 'openmapsurfer')$return = 'GIScience Research Group @ University of Heidelberg'; - else if($bl == 'custom') $return = $style; + if($bl == 'mapnikde') $return = 'Openstreetmap.de (CC-BY-SA)'; + else if($bl == 'stamenwater') $return = 'Stamen Design, CC BY 3.0'; + else if($bl == 'mapquest') $return = 'MapQuest'; + else if($bl == 'opentopomap') $return = 'OpenTopoMap (CC-BY-SA), SRTM'; + else if($bl == 'openmapsurfer') $return = 'GIScience Research Group @ University of Heidelberg'; + else if($bl == 'custom') $return = $style; return $return; } diff --git a/mod_osmod.xml b/mod_osmod.xml index 2069daf..3b520ba 100644 --- a/mod_osmod.xml +++ b/mod_osmod.xml @@ -2,163 +2,163 @@ - OSModul - Martin Kröll - 31.05.2015 - (c) 2012-2015 Martin Kröll - http://www.gnu.org/licenseses/gpl-3.0.html GNU/GPL - technikschlumpf@web.de - http://extensions.joomla.org/extensions/owner/schlumpf - 2.7 - MOD_OSMOD_DESCRIPTION - + OSModul + Martin Kröll + 31.05.2015 + (c) 2012-2015 Martin Kröll + http://www.gnu.org/licenseses/gpl-3.0.html GNU/GPL + technikschlumpf@web.de + http://extensions.joomla.org/extensions/owner/schlumpf + 2.7 + MOD_OSMOD_DESCRIPTION + - - http://jextensions.hof-ronig.de/mod_osmod/update.xml - + + http://jextensions.hof-ronig.de/mod_osmod/update.xml + mod_osmod.script.php - + - - language - tmpl - mod_osmod.xml - mod_osmod.php - helper.php - index.html - CHANGES - + + language + tmpl + mod_osmod.xml + mod_osmod.php + helper.php + index.html + CHANGES + - leaflet - images + leaflet + images - + - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- - -
- - - -
- - -
- -
- - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ + +
+ + + +
+ + +
+ +
+ + + From 50822a12cb91008cd2864ca928d4fdd4cfd3ab62 Mon Sep 17 00:00:00 2001 From: NetzAG Halifax Date: Fri, 13 Nov 2015 16:19:37 +0100 Subject: [PATCH 4/4] add humanitarian (hot) style map layer --- helper.php | 2 ++ mod_osmod.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/helper.php b/helper.php index f02b03e..ca6ae9d 100644 --- a/helper.php +++ b/helper.php @@ -23,6 +23,7 @@ private static function imagery($bl, $style){ else if($bl == 'mapquest') $return = 'MapQuest'; else if($bl == 'opentopomap') $return = 'OpenTopoMap (CC-BY-SA), SRTM'; else if($bl == 'openmapsurfer') $return = 'GIScience Research Group @ University of Heidelberg'; + else if($bl == 'humanitarian') $return = 'Humanitarian OpenStreetMap Team'; else if($bl == 'custom') $return = $style; return $return; } @@ -159,6 +160,7 @@ public static function javascript($params, $id){ else if($params->get('baselayer', 'mapnik') == 'stamenwater') { $baselayerURL = 'http://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png'; $baselayerSettings = "subdomains: 'abcd', minZoom: 1, maxZoom: 16, "; } else if($params->get('baselayer', 'mapnik') == 'opentopomap') { $baselayerURL = 'http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 16, "; } else if($params->get('baselayer', 'mapnik') == 'openmapsurfer') { $baselayerURL = 'http://openmapsurfer.uni-hd.de/tiles/roads/x={x}&y={y}&z={z}'; $baselayerSettings = "maxZoom: 20, "; } + else if($params->get('baselayer', 'mapnik') == 'humanitarian') { $baselayerURL = 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 20, "; } else if($params->get('baselayer', 'mapnik') == 'custom') { $baselayerURL = $params->get('customBaselayerURL', ''); } // load start coordinates diff --git a/mod_osmod.xml b/mod_osmod.xml index 3b520ba..72e4a19 100644 --- a/mod_osmod.xml +++ b/mod_osmod.xml @@ -73,6 +73,7 @@ +