Merge 5ec1b6f10768be0a392fa806ef5800d66ec37714 into 66d17625d85aa144e82702dbd1cf31aadf3d094d

This commit is contained in:
Taro Matsuzawa aka. btm 2019-02-18 04:22:51 +00:00 committed by GitHub
commit 6f781293f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
env

View File

@ -1,4 +1,4 @@
FROM python:3.4 FROM python:3.7.2
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app

View File

@ -1,6 +1,6 @@
tornado==4.4.2 mercantile==1.0.4
sqlalchemy==1.1.5 psycopg2-binary==2.7.7
mercantile==0.9.0 pyproj==1.9.6
pyproj==1.9.5.1 PyYAML==3.13
pyyaml==3.12 SQLAlchemy==1.2.18
psycopg2==2.6.2 tornado==5.1.1

View File

@ -29,7 +29,7 @@ def GeneratePrepared(layers):
layer_query = layer['Datasource']['table'].lstrip().rstrip() # Remove lead and trailing whitespace layer_query = layer['Datasource']['table'].lstrip().rstrip() # Remove lead and trailing whitespace
layer_query = layer_query[1:len(layer_query)-6] # Remove enough characters to remove first and last () and "AS t" layer_query = layer_query[1:len(layer_query)-6] # Remove enough characters to remove first and last () and "AS t"
layer_query = layer_query.replace("geometry", "ST_AsMVTGeom(geometry,!bbox!,4096,0,true) AS mvtgeometry") layer_query = layer_query.replace("geometry", "ST_AsMVTGeom(geometry,!bbox!,4096,0,true) AS mvtgeometry")
base_query = "SELECT ST_ASMVT('"+layer['id']+"', 4096, 'mvtgeometry', tile) FROM ("+layer_query+" WHERE ST_AsMVTGeom(geometry, !bbox!,4096,0,true) IS NOT NULL) AS tile" base_query = "SELECT ST_ASMVT(tile, '"+layer['id']+"', 4096, 'mvtgeometry') FROM ("+layer_query+" WHERE ST_AsMVTGeom(geometry, !bbox!,4096,0,true) IS NOT NULL) AS tile"
queries.append(base_query.replace("!bbox!","$1").replace("!scale_denominator!","$2").replace("!pixel_width!","$3").replace("!pixel_height!","$4")) queries.append(base_query.replace("!bbox!","$1").replace("!scale_denominator!","$2").replace("!pixel_width!","$3").replace("!pixel_height!","$4"))
prepared = prepared + " UNION ALL ".join(queries) + ";" prepared = prepared + " UNION ALL ".join(queries) + ";"
print(prepared) print(prepared)