Compare text

Find the difference between two text files

Real-time editor

Hide unchanged lines

Disable line wrap

Layout

Diff precision

Syntax highlighting

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 11 years agoDiff never expires

0 removals

Lines
Total
Removed

Characters
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

168 lines

19 additions

Lines
Total
Added

Characters
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

186 lines

# This file is part of the MapProxy project.

# 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

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

import math

from mapproxy.client.http import retrieve_image

class TMSClient(object):

def __init__(self, url, format='png', http_client=None):

self.url = url

self.http_client = http_client

self.format = format

def get_tile(self, tile_coord, format=None):

x, y, z = tile_coord

url = '%s/%d/%d/%d.%s' % (self.url, z, x, y, format or self.format)

if self.http_client:

return self.http_client.open_image(url)

else:

return retrieve_image(url)

def __repr__(self):

return '%s(%r, %r)' % (self.__class__.__name__, self.url, self.format)

class TileClient(object):

def __init__(self, url_template, http_client=None, grid=None):

self.url_template = url_template

self.http_client = http_client

self.grid = grid

def get_tile(self, tile_coord, format=None):

url = self.url_template.substitute(tile_coord, format, self.grid)

if self.http_client:

return self.http_client.open_image(url)

else:

return retrieve_image(url)

def __repr__(self):

return '%s(%r)' % (self.__class__.__name__, self.url_template)

class TileURLTemplate(object):

"""

>>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')

>>> t.substitute((7, 4, 3))

'http://foo/tiles/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')

>>> t.substitute((7, 4, 3))

'http://foo/tiles/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tiles/%(tc_path)s.png')

>>> t.substitute((7, 4, 3))

'http://foo/tiles/03/000/000/007/000/000/004.png'

>>> t = TileURLTemplate('http://foo/tms/1.0.0/%(tms_path)s.%(format)s')

>>> t.substitute((7, 4, 3))

'http://foo/tms/1.0.0/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tms/1.0.0/lyr/%(tms_path)s.%(format)s')

>>> t.substitute((7, 4, 3), 'jpeg')

'http://foo/tms/1.0.0/lyr/3/7/4.jpeg'

"""

def __init__(self, template, format='png'):

self.template= template

self.format = format

self.with_quadkey = True if '%(quadkey)' in template else False

self.with_tc_path = True if '%(tc_path)' in template else False

self.with_tms_path = True if '%(tms_path)' in template else False

self.with_arcgiscache_path = True if '%(arcgiscache_path)' in template else False

self.with_google_static = True if '%(google_static_params)' in template else False

self.with_bbox = True if '%(bbox)' in template else False

def substitute(self, tile_coord, format=None, grid=None):

x, y, z = tile_coord

data = dict(x=x, y=y, z=z)

data['format'] = format or self.format

if self.with_quadkey:

data['quadkey'] = quadkey(tile_coord)

if self.with_tc_path:

data['tc_path'] = tilecache_path(tile_coord)

if self.with_tms_path:

data['tms_path'] = tms_path(tile_coord)

if self.with_arcgiscache_path:

data['arcgiscache_path'] = arcgiscache_path(tile_coord)

if self.with_google_static:

data['google_static_params'] = google_static(tile_coord,grid)

if self.with_bbox:

data['bbox'] = bbox(tile_coord, grid)

return self.template % data

def __repr__(self):

return '%s(%r, format=%r)' % (

self.__class__.__name__, self.template, self.format)

def google_static(tile_coord,grid):

x, y, z = tile_coord

center_x = (x+0.5)/math.pow(2,z)*360-180

if grid.origin in ('nw','ll'):

y_add = 1

else:

y_add = -1

n1 = math.pi-2*math.pi*y/math.pow(2,z)

n2 = math.pi-2*math.pi*(y+y_add)/math.pow(2,z)

center_y1 = 180/math.pi*math.atan(0.5*(math.exp(n1)-math.exp(-n1)))

center_y2 = 180/math.pi*math.atan(0.5*(math.exp(n2)-math.exp(-n2)))

center_y = center_y1+y_add*abs(center_y1-center_y2)/2

return 'center=%s,%s&zoom=%s&size=%sx%s' % (center_y,center_x,z,grid.tile_size[0],grid.tile_size[1])

def tilecache_path(tile_coord):

"""

>>> tilecache_path((1234567, 87654321, 9))

'09/001/234/567/087/654/321'

"""

x, y, z = tile_coord

parts = ("%02d" % z,

"%03d" % int(x / 1000000),

"%03d" % (int(x / 1000) % 1000),

"%03d" % (int(x) % 1000),

"%03d" % int(y / 1000000),

"%03d" % (int(y / 1000) % 1000),

"%03d" % (int(y) % 1000))

return '/'.join(parts)

def quadkey(tile_coord):

"""

>>> quadkey((0, 0, 1))

'0'

>>> quadkey((1, 0, 1))

'1'

>>> quadkey((1, 2, 2))

'21'

"""

x, y, z = tile_coord

quadKey = ""

for i in range(z,0,-1):

digit = 0

mask = 1 << (i-1)

if (x & mask) != 0:

digit += 1

if (y & mask) != 0:

digit += 2

quadKey += str(digit)

return quadKey

def tms_path(tile_coord):

"""

>>> tms_path((1234567, 87654321, 9))

'9/1234567/87654321'

"""

return '%d/%d/%d' % (tile_coord[2], tile_coord[0], tile_coord[1])

def arcgiscache_path(tile_coord):

"""

>>> arcgiscache_path((1234567, 87654321, 9))

'L09/R05397fb1/C0012d687'

"""

return 'L%02d/R%08x/C%08x' % (tile_coord[2], tile_coord[1], tile_coord[0])

def bbox(tile_coord, grid):

"""

>>> from mapproxy.grid import tile_grid

>>> grid = tile_grid(4326, bbox=(0, -15, 10, -5))

>>> bbox((0, 0, 0), grid)

'0.00000000,-15.00000000,10.00000000,-5.00000000'

>>> bbox((0, 0, 1), grid)

'0.00000000,-15.00000000,5.00000000,-10.00000000'

>>> grid = tile_grid(4326, bbox=(0, -15, 10, -5), origin='nw')

>>> bbox((0, 0, 1), grid)

'0.00000000,-10.00000000,5.00000000,-5.00000000'

"""

return '%.8f,%.8f,%.8f,%.8f' % grid.tile_bbox(tile_coord)

Saved diffs

Original text

Open file

# This file is part of the MapProxy project.
# Copyright (C) 2010 Omniscale <http://omniscale.de>
# 
# 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
# 
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from mapproxy.client.http import retrieve_image

class TMSClient(object):
    def __init__(self, url, format='png', http_client=None):
        self.url = url
        self.http_client = http_client
        self.format = format
    
    def get_tile(self, tile_coord, format=None):
        x, y, z = tile_coord
        url = '%s/%d/%d/%d.%s' % (self.url, z, x, y, format or self.format)
        if self.http_client:
            return self.http_client.open_image(url)
        else:
            return retrieve_image(url)
    
    def __repr__(self):
        return '%s(%r, %r)' % (self.__class__.__name__, self.url, self.format)

class TileClient(object):
    def __init__(self, url_template, http_client=None, grid=None):
        self.url_template = url_template
        self.http_client = http_client
        self.grid = grid
    
    def get_tile(self, tile_coord, format=None):
        url = self.url_template.substitute(tile_coord, format, self.grid)
        if self.http_client:
            return self.http_client.open_image(url)
        else:
            return retrieve_image(url)
    
    def __repr__(self):
        return '%s(%r)' % (self.__class__.__name__, self.url_template)

class TileURLTemplate(object):
    """
    >>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')
    >>> t.substitute((7, 4, 3))
    'http://foo/tiles/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')
    >>> t.substitute((7, 4, 3))
    'http://foo/tiles/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tiles/%(tc_path)s.png')
    >>> t.substitute((7, 4, 3))
    'http://foo/tiles/03/000/000/007/000/000/004.png'
    
    >>> t = TileURLTemplate('http://foo/tms/1.0.0/%(tms_path)s.%(format)s')
    >>> t.substitute((7, 4, 3))
    'http://foo/tms/1.0.0/3/7/4.png'
    
    >>> t = TileURLTemplate('http://foo/tms/1.0.0/lyr/%(tms_path)s.%(format)s')
    >>> t.substitute((7, 4, 3), 'jpeg')
    'http://foo/tms/1.0.0/lyr/3/7/4.jpeg'
    
    """
    def __init__(self, template, format='png'):
        self.template= template
        self.format = format
        self.with_quadkey = True if '%(quadkey)' in template else False
        self.with_tc_path = True if '%(tc_path)' in template else False
        self.with_tms_path = True if '%(tms_path)' in template else False
        self.with_arcgiscache_path = True if '%(arcgiscache_path)' in template else False
        self.with_bbox = True if '%(bbox)' in template else False

def substitute(self, tile_coord, format=None, grid=None):
        x, y, z = tile_coord
        data = dict(x=x, y=y, z=z)
        data['format'] = format or self.format
        if self.with_quadkey:
            data['quadkey'] = quadkey(tile_coord)
        if self.with_tc_path:
            data['tc_path'] = tilecache_path(tile_coord)
        if self.with_tms_path:
            data['tms_path'] = tms_path(tile_coord)
        if self.with_arcgiscache_path:
            data['arcgiscache_path'] = arcgiscache_path(tile_coord)
        if self.with_bbox:
            data['bbox'] = bbox(tile_coord, grid)

return self.template % data
    
    def __repr__(self):
        return '%s(%r, format=%r)' % (
            self.__class__.__name__, self.template, self.format)

def tilecache_path(tile_coord):
    """
    >>> tilecache_path((1234567, 87654321, 9))
    '09/001/234/567/087/654/321'
    """
    x, y, z = tile_coord
    parts = ("%02d" % z,
             "%03d" % int(x / 1000000),
             "%03d" % (int(x / 1000) % 1000),
             "%03d" % (int(x) % 1000),
             "%03d" % int(y / 1000000),
             "%03d" % (int(y / 1000) % 1000),
             "%03d" % (int(y) % 1000))
    return '/'.join(parts)

def quadkey(tile_coord):
    """
    >>> quadkey((0, 0, 1))
    '0'
    >>> quadkey((1, 0, 1))
    '1'
    >>> quadkey((1, 2, 2))
    '21'
    """
    x, y, z = tile_coord
    quadKey = ""
    for i in range(z,0,-1):
        digit = 0
        mask = 1 << (i-1)
        if (x & mask) != 0:
            digit += 1
        if (y & mask) != 0:
            digit += 2
        quadKey += str(digit)
    return quadKey

def tms_path(tile_coord):
    """
    >>> tms_path((1234567, 87654321, 9))
    '9/1234567/87654321'
    """
    return '%d/%d/%d' % (tile_coord[2], tile_coord[0], tile_coord[1])

def arcgiscache_path(tile_coord):
   """
   >>> arcgiscache_path((1234567, 87654321, 9))
   'L09/R05397fb1/C0012d687'
   """
   return 'L%02d/R%08x/C%08x' % (tile_coord[2], tile_coord[1], tile_coord[0])

def bbox(tile_coord, grid):
    """
    >>> from mapproxy.grid import tile_grid
    >>> grid = tile_grid(4326, bbox=(0, -15, 10, -5))
    >>> bbox((0, 0, 0), grid)
    '0.00000000,-15.00000000,10.00000000,-5.00000000'
    >>> bbox((0, 0, 1), grid)
    '0.00000000,-15.00000000,5.00000000,-10.00000000'
    
    >>> grid = tile_grid(4326, bbox=(0, -15, 10, -5), origin='nw')
    >>> bbox((0, 0, 1), grid)
    '0.00000000,-10.00000000,5.00000000,-5.00000000'
    """
    return '%.8f,%.8f,%.8f,%.8f' % grid.tile_bbox(tile_coord)

Changed text

Open file

class TileURLTemplate(object):
    """
    >>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')
    >>> t.substitute((7, 4, 3))
    'http://foo/tiles/3/7/4.png'

>>> t = TileURLTemplate('http://foo/tiles/%(z)s/%(x)d/%(y)s.png')
    >>> t.substitute((7, 4, 3))
    'http://foo/tiles/3/7/4.png'

def substitute(self, tile_coord, format=None, grid=None):
        x, y, z = tile_coord
        data = dict(x=x, y=y, z=z)
        data['format'] = format or self.format
        if self.with_quadkey:
            data['quadkey'] = quadkey(tile_coord)
        if self.with_tc_path:
            data['tc_path'] = tilecache_path(tile_coord)
        if self.with_tms_path:
            data['tms_path'] = tms_path(tile_coord)
        if self.with_arcgiscache_path:
            data['arcgiscache_path'] = arcgiscache_path(tile_coord)
        if self.with_google_static:
            data['google_static_params'] = google_static(tile_coord,grid)
        if self.with_bbox:
            data['bbox'] = bbox(tile_coord, grid)

return self.template % data
    
    def __repr__(self):
        return '%s(%r, format=%r)' % (
            self.__class__.__name__, self.template, self.format)
            
def google_static(tile_coord,grid):

x, y, z = tile_coord
    center_x = (x+0.5)/math.pow(2,z)*360-180
    if grid.origin in ('nw','ll'):
        y_add = 1
    else:
        y_add = -1
    n1 = math.pi-2*math.pi*y/math.pow(2,z)
    n2 = math.pi-2*math.pi*(y+y_add)/math.pow(2,z)
    center_y1 = 180/math.pi*math.atan(0.5*(math.exp(n1)-math.exp(-n1)))
    center_y2 = 180/math.pi*math.atan(0.5*(math.exp(n2)-math.exp(-n2)))
    center_y = center_y1+y_add*abs(center_y1-center_y2)/2
    return 'center=%s,%s&zoom=%s&size=%sx%s' % (center_y,center_x,z,grid.tile_size[0],grid.tile_size[1])

def tms_path(tile_coord):
    """
    >>> tms_path((1234567, 87654321, 9))
    '9/1234567/87654321'
    """
    return '%d/%d/%d' % (tile_coord[2], tile_coord[0], tile_coord[1])