ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Download and use new proj4js

Browse Source
This commit is contained in:
Andreas Hocevar
2014-07-08 01:00:38 +02:00
parent d215696154
commit 971c1137bc
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.py
+3 -15
View File
@@ -128,9 +128,7 @@ SRC = [path
if path.endswith('.js') if path.endswith('.js')
if path not in SHADER_SRC] if path not in SHADER_SRC]
PROJ4JS = 'build/proj4js/lib/proj4js-combined.js' PROJ4JS = 'build/proj4js/dist/proj4.js'
PROJ4JS_ZIP = 'build/proj4js-1.1.0.zip'
PROJ4JS_ZIP_MD5 = '17caad64cf6ebc6e6fe62f292b134897'
def report_sizes(t): def report_sizes(t):
@@ -671,23 +669,13 @@ def check_examples(t):
t.run('%(PHANTOMJS)s', 'bin/check-example.js', example) t.run('%(PHANTOMJS)s', 'bin/check-example.js', example)
@target(PROJ4JS, PROJ4JS_ZIP) @target(PROJ4JS)
def proj4js(t): def proj4js(t):
from zipfile import ZipFile contents = open('node_modules/proj4/dist/proj4.js').read()
zf = ZipFile(PROJ4JS_ZIP)
contents = zf.open('proj4js/lib/proj4js-combined.js').read()
with open(t.name, 'wb') as f: with open(t.name, 'wb') as f:
f.write(contents) f.write(contents)
@target(PROJ4JS_ZIP, clean=False)
def proj4js_zip(t):
t.info('downloading %r', t.name)
t.download('http://download.osgeo.org/proj4js/' +
os.path.basename(t.name), md5=PROJ4JS_ZIP_MD5)
t.info('downloaded %r', t.name)
@target('test', PROJ4JS, phony=True) @target('test', PROJ4JS, phony=True)
def test(t): def test(t):
t.run('node', 'tasks/test.js') t.run('node', 'tasks/test.js')
examples/wms-custom-proj.html
+2 -2
View File
@@ -44,8 +44,8 @@
</div> </div>
<script src="jquery.min.js" type="text/javascript"></script> <script src="jquery.min.js" type="text/javascript"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/proj4js-compressed.js" type="text/javascript"></script> <script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.1.4/proj4.js" type="text/javascript"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/defs/EPSG21781.js" type="text/javascript"></script> <script src="http://epsg.io/21781.js" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script> <script src="../resources/example-behaviour.js" type="text/javascript"></script>
<script src="loader.js?id=wms-custom-proj" type="text/javascript"></script> <script src="loader.js?id=wms-custom-proj" type="text/javascript"></script>
examples/wms-image-custom-proj.html
+2 -2
View File
@@ -45,8 +45,8 @@
</div> </div>
<script src="jquery.min.js" type="text/javascript"></script> <script src="jquery.min.js" type="text/javascript"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/proj4js-compressed.js" type="text/javascript"></script> <script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.1.4/proj4.js" type="text/javascript"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/defs/EPSG21781.js" type="text/javascript"></script> <script src="http://epsg.io/21781.js" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script> <script src="../resources/example-behaviour.js" type="text/javascript"></script>
<script src="loader.js?id=wms-image-custom-proj" type="text/javascript"></script> <script src="loader.js?id=wms-image-custom-proj" type="text/javascript"></script>
test/index.html
+1 -1
View File
@@ -20,7 +20,7 @@
bail: false bail: false
}); });
</script> </script>
<script type="text/javascript" src="../build/proj4js/lib/proj4js-combined.js"></script> <script type="text/javascript" src="../build/proj4js/dist/proj4.js"></script>
<!-- This script is provided by the debug server (start with `build.py serve`) --> <!-- This script is provided by the debug server (start with `build.py serve`) -->
<script type="text/javascript" src="loader.js"></script> <script type="text/javascript" src="loader.js"></script>