- $tmsserver = Config::get('openstreetmap', 'tmsserver');
- if (!$tmsserver) {
- $tmsserver = 'http://www.openstreetmap.org';
- }
- $nomserver = Config::get('openstreetmap', 'nomserver');
- if (!$nomserver) {
- $nomserver = 'http://nominatim.openstreetmap.org/search.php';
- }
- $zoom = Config::get('openstreetmap', 'zoom');
- if (!$zoom) {
- $zoom = 16;
- }
- $marker = Config::get('openstreetmap', 'marker');
- if (!$marker) {
- $marker = 0;
+ $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+ $nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+ $zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
+ $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+
+ // This is needed since we stored an empty string in the config in previous versions
+ if (empty($nomserver)) {
+ $nomserver = OSM_NOM;