nominatim: switch server to new location of nominatim

[chef.git] / cookbooks / imagery / recipes / za_ngi_topo.rb

diff --git a/cookbooks/imagery/recipes/za_ngi_topo.rb b/cookbooks/imagery/recipes/za_ngi_topo.rb
index cfefcb5e682dbb4953d17bf3ede06a17c6f4105d..46d0a8bc0c398e583fddc70dae723b414a1f097b 100644 (file)
--- a/cookbooks/imagery/recipes/za_ngi_topo.rb
+++ b/cookbooks/imagery/recipes/za_ngi_topo.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: imagery
+# Cookbook:: imagery
 # Recipe:: za_ngi_topo
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@ include_recipe "imagery"
 imagery_site "topo.openstreetmap.org.za" do
   title "OpenStreetMap - NGI - Topographic Series"
   aliases ["topo.osm.org.za"]
-  bbox [[16.23, -35.12], [33.18, -22.1]]
+  bbox [[-35.12, 16.23], [-22.1, 33.18]]
 end
 
 imagery_layer "za_ngi_topo_250k" do
@@ -30,7 +30,8 @@ imagery_layer "za_ngi_topo_250k" do
   title "NGI Topo 250k"
   projection "EPSG:3857"
   source "/data/imagery/za/ngi-topo-250k/ngi-topo-250k-combined.vrt"
-  copyright 'State Copyright &copy; 1996&ndash;2010 <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  copyright 'State Copyright &copy; 1996&ndash;2010 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  default_layer true
 end
 
 imagery_layer "za_ngi_topo_50k" do
@@ -38,5 +39,5 @@ imagery_layer "za_ngi_topo_50k" do
   title "NGI Topo 50k"
   projection "EPSG:3857"
   source "/data/imagery/za/ngi-topo-50k/ngi-topo-50k-combined.vrt"
-  copyright 'State Copyright &copy; 1996&ndash;2013 <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  copyright 'State Copyright &copy; 1996&ndash;2013 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
 end