Merge pull request #33 from interline-io/update-mirrors

Add support for OSM download mirrors

Author: irees

planetutils/osm_planet_update.py

@@ -14,18 +14,23 @@ def main():
     parser.add_argument('--workdir', help="Osmosis replication workingDirectory.", default='.')
     parser.add_argument('--verbose', help="Verbose output", action='store_true')
     parser.add_argument('--size', help='Osmium update memory limit', default='1024')
+    parser.add_argument('--mirror', help='Base URL for OSM mirror', default='https://planet.osm.org')
     args = parser.parse_args()
 
+    planet_source = "%s/pbf/planet-latest.osm.pbf"%args.mirror
+    diff_source = "%s/replication/hour"%args.mirror
+
     if args.verbose:
         log.set_verbose()
 
     if not os.path.exists(args.osmpath):
         log.info("planet does not exist; downloading")
         if args.s3:
             d = PlanetDownloaderS3(args.osmpath)
+            d.download_planet()
         else:
             d = PlanetDownloaderHttp(args.osmpath)
-        d.download_planet()
+            d.download_planet(url=planet_source)
 
     if args.toolchain == 'osmosis':
         p = PlanetUpdaterOsmosis(args.osmpath)
@@ -34,7 +39,7 @@ def main():
     else:
         parser.error('unknown toolchain: %s'%args.toolchain)
 
-    p.update_planet(args.outpath, size=args.size)
+    p.update_planet(args.outpath, size=args.size, changeset_url=diff_source)
 
 if __name__ == '__main__':
     main()

planetutils/planet.py

@@ -193,9 +193,10 @@ class PlanetUpdaterOsmupdate(PlanetBase):
 
 class PlanetUpdaterOsmium(PlanetBase):
     def update_planet(self, outpath, grain='minute', changeset_url=None, size='1024', **kw):
+        changeset_url = changeset_url or 'https://planet.openstreetmap.org/replication/%s'%grain        
         if not os.path.exists(self.osmpath):
             raise Exception('planet file does not exist: %s'%self.osmpath)
-        self.command(['pyosmium-up-to-date', '-s', size, '-v', self.osmpath, '-o', outpath])
+        self.command(['pyosmium-up-to-date', '-s', size, '--server', changeset_url, '-v', self.osmpath, '-o', outpath])
 
 class PlanetUpdaterOsmosis(PlanetBase):
     def update_planet(self, outpath, grain='minute', changeset_url=None, **kw):