aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Draxinger <code@datenwolf.net>2021-10-11 18:03:08 +0200
committerWolfgang Draxinger <code@datenwolf.net>2021-10-11 18:03:08 +0200
commit44a03965fbb3bbd4c58ced4bfdf105c74c0f3086 (patch)
tree903e5a49cfdca46d09e911d069632138d959cf30
parent8949ba5d0ae6f1f1689f0bde7c8f366550a3284d (diff)
downloadgooglemaps2007_dl-44a03965fbb3bbd4c58ced4bfdf105c74c0f3086.tar.gz
googlemaps2007_dl-44a03965fbb3bbd4c58ced4bfdf105c74c0f3086.tar.bz2
deleted stale files
-rwxr-xr-xgm_display.py~29
-rwxr-xr-xgm_fetch.py~95
-rw-r--r--googlemaps.py8
-rw-r--r--googlemaps.pycbin4622 -> 0 bytes
-rw-r--r--googlemaps.py~124
5 files changed, 4 insertions, 252 deletions
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
--- a/googlemaps.pyc
+++ /dev/null
Binary files 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<<bit):
- index |= 1
- if y & (1<<bit):
- index |= 2
- sel += sel_t[index]
- return sel
-
-def fetch_satellite_img(x, y, zoom):
- if zoom < MIN_SATELLITE_ZOOM:
- return None
- x = int(x)
- 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()
- return fetch(url)
-
-def fetch_map_img(x, y, zoom):
- if zoom < MIN_MAP_ZOOM:
- return None
- x = int(x)
- y = int(y)
- num = (x+y)%4
- mapmode = "w2.69"
- 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)
-
-def fetch_relief_img(x, y, zoom):
- if zoom < MIN_RELIEF_ZOOM:
- return None
- x = int(x)
- y = int(y)
- num = (x+y)%4
- mapmode = "w2p.71"
- 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)
-
-def fetch_overlay_img(x, y, zoom):
- if zoom < MIN_OVERLAY_ZOOM:
- return None
- x = int(x)
- y = int(y)
- num = (x+y)%4
- mapmode = "w2t.69"
- 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)
-
-def get_image_number(lon, lat, zoom):
- import math
- from math import pi
-
- def deg2rad(a):
- return a * pi/180.
-
- def frac(x):
- return x - math.floor(x)
-
- def h(lat):
- lat = deg2rad(lat)
- # value determined by fitting original google maps
- # output to mercator map formula
- a = 0.0795775
- # mercator projection formula
- return a * math.log((1. + math.sin(lat)) / (1. - math.sin(lat)))
-
- t = (2**(17-zoom))
- off = (2**(16-zoom))
-
- lat = h(-lat)
- lon = (lon / 360.)
-
- x = lon * t + off
- y = lat * t + off
-
- xx = int(x)
- yy = int(y)
-
- px = frac(x) * 256
- py = frac(y) * 256
-
- return (xx, yy, x, y, px, py)
-
-def get_satellite(lon, lat, zoom):
- if zoom < MIN_SATELLITE_ZOOM:
- return None
- img_num = get_image_number(lon, lat, zoom)
- return fetch_satellite_img(img_num[0], img_num[1], zoom)
-
-def get_map(lon, lat, zoom):
- if zoom < MIN_MAP_ZOOM:
- return None
- img_num = get_image_number(lon, lat, zoom)
- return fetch_map_img(img_num[0], img_num[1], zoom)
-
-def get_relief(lon, lat, zoom):
- if zoom < MIN_RELIEF_ZOOM:
- return None
- img_num = get_image_number(lon, lat, zoom)
- return fetch_relief_img(img_num[0], img_num[1], zoom)
-
-def get_overlay(lon, lat, zoom):
- if zoom < MIN_OVERLAY_ZOOM:
- return None
- img_num = get_image_number(lon, lat, zoom)
- return fetch_overlay_img(img_num[0], img_num[1], zoom)