From 971c1137bc420a528cd999e385098123461720d8 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 8 Jul 2014 01:00:38 +0200
Subject: [PATCH] Download and use new proj4js

---
 build.py                            | 18 +++---------------
 examples/wms-custom-proj.html       |  4 ++--
 examples/wms-image-custom-proj.html |  4 ++--
 test/index.html                     |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/build.py b/build.py
index cf7ff7a6b7..ff6b9a4ded 100755
--- a/build.py
+++ b/build.py
@@ -128,9 +128,7 @@ SRC = [path
        if path.endswith('.js')
        if path not in SHADER_SRC]
 
-PROJ4JS = 'build/proj4js/lib/proj4js-combined.js'
-PROJ4JS_ZIP = 'build/proj4js-1.1.0.zip'
-PROJ4JS_ZIP_MD5 = '17caad64cf6ebc6e6fe62f292b134897'
+PROJ4JS = 'build/proj4js/dist/proj4.js'
 
 
 def report_sizes(t):
@@ -671,23 +669,13 @@ def check_examples(t):
         t.run('%(PHANTOMJS)s', 'bin/check-example.js', example)
 
 
-@target(PROJ4JS, PROJ4JS_ZIP)
+@target(PROJ4JS)
 def proj4js(t):
-    from zipfile import ZipFile
-    zf = ZipFile(PROJ4JS_ZIP)
-    contents = zf.open('proj4js/lib/proj4js-combined.js').read()
+    contents = open('node_modules/proj4/dist/proj4.js').read()
     with open(t.name, 'wb') as f:
         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)
 def test(t):
     t.run('node', 'tasks/test.js')
diff --git a/examples/wms-custom-proj.html b/examples/wms-custom-proj.html
index 12a1dec0f1..3251b437e0 100644
--- a/examples/wms-custom-proj.html
+++ b/examples/wms-custom-proj.html
@@ -44,8 +44,8 @@
     </div>
 
     <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/1.1.0/defs/EPSG21781.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://epsg.io/21781.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>
 
diff --git a/examples/wms-image-custom-proj.html b/examples/wms-image-custom-proj.html
index e8c7230996..474aa9540a 100644
--- a/examples/wms-image-custom-proj.html
+++ b/examples/wms-image-custom-proj.html
@@ -45,8 +45,8 @@
     </div>
 
     <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/1.1.0/defs/EPSG21781.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://epsg.io/21781.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>
 
diff --git a/test/index.html b/test/index.html
index 09681d5542..ae9d85feaa 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,7 +20,7 @@
       bail: false
     });
   </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`) -->
   <script type="text/javascript" src="loader.js"></script>