From 44a03965fbb3bbd4c58ced4bfdf105c74c0f3086 Mon Sep 17 00:00:00 2001 From: Wolfgang Draxinger Date: Mon, 11 Oct 2021 18:03:08 +0200 Subject: deleted stale files --- gm_display.py~ | 29 -------------- gm_fetch.py~ | 95 ------------------------------------------- googlemaps.py | 8 ++-- googlemaps.pyc | Bin 4622 -> 0 bytes googlemaps.py~ | 124 --------------------------------------------------------- 5 files changed, 4 insertions(+), 252 deletions(-) delete mode 100755 gm_display.py~ delete mode 100755 gm_fetch.py~ delete mode 100644 googlemaps.pyc delete mode 100644 googlemaps.py~ diff --git a/gm_display.py~ b/gm_display.py~ deleted file mode 100755 index 4938644..0000000 --- a/gm_display.py~ +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/python - -import googlemaps - -import os, sys -from math import * - -lat = 0 -lon = 0 -zoom = 10 -mode = "map" - -for arg in sys.argv[1:]: - exec arg - -if mode == "relief": - img = googlemaps.get_relief(lon, lat, zoom) - -if mode == "overlay": - img = googlemaps.get_overlay(lon, lat, zoom) - -if mode == "map": - img = googlemaps.get_map(lon, lat, zoom) - -if mode == "sat" or mode == "satellite": - img = googlemaps.get_satellite(lon, lat, zoom) - -if img: - popen("display", 'w').write(img) diff --git a/gm_fetch.py~ b/gm_fetch.py~ deleted file mode 100755 index 11e0ddd..0000000 --- a/gm_fetch.py~ +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python -import googlemaps as gm -import sys, os - -basedir = "gmfetch_DL" -dryrun = 1 - -for arg in sys.argv[1:]: - exec arg - -if lon[0] > lon[1]: - lon = (lon[1], lon[0]) - -if lat[0] > lat[1]: - lat = (lat[1], lat[0]) - -print lon, lat - -zooms = range(-5, 18) -zooms.reverse() -for z in zooms: - for d in ['sat', 'map', 'overlay', 'relief']: - try: - os.makedirs("%s/%s" % (basedir, d)) - except: - pass - - img_num = (gm.get_image_number(lon[0], lat[0], z), gm.get_image_number(lon[1], lat[1], z)) - - for y in range(img_num[1][1], img_num[0][1]+1): - for x in range(img_num[0][0], img_num[1][0]+1): - sel = gm.image_number_to_sel(x, y, z, ['a', 'b', 'c', 'd']) - if not dryrun: - img_sat = None - img_map = None - img_overlay = None - img_relief = None - - img_sat_file = "%s/sat/%s" % ( basedir, sel) - img_map_file = "%s/map/%s" % ( basedir, sel) - img_overlay_file = "%s/overlay/%s" % ( basedir, sel) - img_relief_file = "%s/relief/%s" % ( basedir, sel) - - try: - pass - #os.stat(img_sat_file) - except OSError: - print "sat %d %d %d" % (x,y,z), - img_sat = gm.fetch_satellite_img(x, y, z) - if img_sat: - f = open("%s/sat/%s" % (basedir, sel), 'w') - f.write(img_sat) - f.close() - else: - print " failed", - print - - try: - os.stat(img_map_file) - except OSError: - print "map %d %d %d" % (x,y,z), - img_map = gm.fetch_map_img(x, y, z) - if img_map: - f = open("%s/map/%s" % (basedir, sel), 'w') - f.write(img_map) - f.close() - else: - print " failed", - print - - try: - os.stat(img_overlay_file) - except OSError: - print "overlay %d %d %d" % (x,y,z), - img_overlay = gm.fetch_overlay_img(x, y, z) - if img_overlay: - f = open("%s/overlay/%s" % (basedir, sel), 'w') - f.write(img_overlay) - f.close() - else: - print " failed", - print - - try: - os.stat(img_relief_file) - except: - print "relief %d %d %d" % (x,y,z), - img_relief = gm.fetch_relief_img(x, y, z) - if img_relief: - f = open("%s/relief/%s" % (basedir, sel), 'w') - f.write(img_relief) - f.close() - else: - print " failed", - print diff --git a/googlemaps.py b/googlemaps.py index 0998cfd..52f9ac4 100644 --- a/googlemaps.py +++ b/googlemaps.py @@ -31,7 +31,7 @@ def fetch_satellite_img(x, y, zoom): y = int(y) num = (x+y)%4 sel = image_number_to_sel(x, y, zoom) - url = "http://kh%(num)d.google.com/kh?n=404&v&t=%(sel)s" % vars() + url = "http://khm%(num)d.google.com/kh?n=404&v=30&t=%(sel)s" % vars() return fetch(url) def fetch_map_img(x, y, zoom): @@ -40,7 +40,7 @@ def fetch_map_img(x, y, zoom): x = int(x) y = int(y) num = (x+y)%4 - mapmode = "w2.75" + mapmode = "w2.80" url = "http://mt%(num)d.google.com/mt?n=404&v=%(mapmode)s&zoom=%(zoom)d&x=%(x)d&y=%(y)d" % vars() return fetch(url) @@ -50,7 +50,7 @@ def fetch_relief_img(x, y, zoom): x = int(x) y = int(y) num = (x+y)%4 - mapmode = "w2p.71" + mapmode = "w2p.81" url = "http://mt%(num)d.google.com/mt?n=404&v=%(mapmode)s&zoom=%(zoom)d&x=%(x)d&y=%(y)d" % vars() return fetch(url) @@ -60,7 +60,7 @@ def fetch_overlay_img(x, y, zoom): x = int(x) y = int(y) num = (x+y)%4 - mapmode = "w2t.75" + mapmode = "w2t.80" url = "http://mt%(num)d.google.com/mt?n&v=%(mapmode)s&zoom=%(zoom)d&x=%(x)d&y=%(y)d" % vars() return fetch(url) diff --git a/googlemaps.pyc b/googlemaps.pyc deleted file mode 100644 index 207afc3..0000000 Binary files a/googlemaps.pyc and /dev/null differ diff --git a/googlemaps.py~ b/googlemaps.py~ deleted file mode 100644 index 81a8060..0000000 --- a/googlemaps.py~ +++ /dev/null @@ -1,124 +0,0 @@ -MIN_SATELLITE_ZOOM = -5 -MIN_MAP_ZOOM = 0 -MIN_OVERLAY_ZOOM = 0 -MIN_RELIEF_ZOOM = 2 - -def fetch(url): - import os - img = os.popen('curl -f "%(url)s"' % vars(), 'r').read() - if len(img): - return img - return None - -def image_number_to_sel(x, y, zoom, sel_t = ['q','r','t','s']): - x = int(x) - y = int(y) - bits = range(17-zoom); bits.reverse() - sel = 't' - for bit in bits: - index = 0 - if x & (1<