Merge pull request #41 from jericks/geotools_12

Upgrade to GeoTools 12 and JTS 1.3

Author: jericks

.travis.yml

@@ -1,5 +1,5 @@
 language: java
 
 jdk:
-  - openjdk6
+  - openjdk7
 

pom.xml

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <version>1.1.0-SNAPSHOT</version>
     <properties>
-        <gt.version>9.0</gt.version>
+        <gt.version>12.0</gt.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>com.vividsolutions</groupId>
                 <artifactId>jts</artifactId>
-                <version>1.12</version>
+                <version>1.13</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -142,13 +142,18 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                     <debug>true</debug>
                     <encoding>UTF-8</encoding>
                     <fork>true</fork>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.10</version>
+            </plugin>
             <plugin>
                 <inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/resources/org/geoscript/js/lib/geoscript/filter/expression.js

@@ -44,7 +44,7 @@ var Expression = exports.Expression = UTIL.extend(GeoObject, {
     var text;
     if (this._expression) {
       if (this.literal) {
-        text = this._expression.getLiteral();
+        text = this._expression.getValue();
         if ((text instanceof java.lang.String) || typeof text === "string") {
           text = "'" + String(text) + "'";
         } else {
@@ -62,7 +62,7 @@ var Expression = exports.Expression = UTIL.extend(GeoObject, {
    *  This expression is just a literal value.
    */
   get literal() {
-    return Boolean(this._expression instanceof Packages.org.geotools.filter.LiteralExpressionImpl);
+    return Boolean(this._expression instanceof Packages.org.opengis.filter.expression.Literal);
   },
 
   get config() {

src/main/resources/org/geoscript/js/lib/geoscript/filter/filter.js

@@ -198,10 +198,11 @@ Filter.not = function(filter) {
 };
 
 Filter.fids = function(fids) {
-  var _filter = FilterFactory2.createFidFilter();
+  var idFilters = []
   for (var i=0, len=fids.length; i<len; ++i) {
-    _filter.addFid(fids[i]);
+    idFilters.push(FilterFactory2.featureId(fids[i]));
   }
+  var _filter = FilterFactory2.id(idFilters);
   return Filter.from_(_filter);
 };
 

src/main/resources/org/geoscript/js/lib/geoscript/layer.js

@@ -486,10 +486,11 @@ var Layer = UTIL.extend(GeoObject, {
   update: function() {
     var modified = this.cache.modifiedFeatures;
     if (modified) {
-      var _filter = FilterFactory2.createFidFilter();
+      var idFilters = [];
       for (var id in modified) {
-        _filter.addFid(id);
+        idFilters.push(FilterFactory2.featureId(id));
       }
+      var _filter = FilterFactory2.id(idFilters);
       var results = this._source.dataStore.getFeatureWriter(this.name, _filter, Transaction.AUTO_COMMIT);
       try {
         while (results.hasNext()) {

src/test/resources/org/geoscript/js/tests/geoscript/style/test_style.js

@@ -184,7 +184,7 @@ exports["test: _style (multiple featureTypeStyle)"] = function() {
     ASSERT.equal(rule.getMinScaleDenominator(), 100000, "first rule has correct min scale denominator");
     ASSERT.equal(rule.getMaxScaleDenominator(), 200000, "first rule has correct max scale denominator");
     ASSERT.ok(rule.getFilter() instanceof geotools.filter.IsEqualsToImpl, "first rule has filter");
-    ASSERT.equal(String(rule.getFilter().getRightValue()), "foo", "first rule filter is good");
+    ASSERT.equal(String(rule.getFilter().getExpression2().getValue()), "foo", "first rule filter is good");
 
     var symbolizers = rule.getSymbolizers();
     ASSERT.equal(symbolizers.length, 1, "one symbolizer in first feature type style");

src/test/resources/org/geoscript/js/tests/geoscript/test_filter.js

@@ -5,14 +5,14 @@ var FILTER = require("geoscript/filter");
 exports["test and"] = function() {
 
     var f = FILTER.and(["name = 'foo'", "type = 'bar'"]);
-    ASSERT.strictEqual(f.cql, "(name = 'foo' AND type = 'bar')", "correct cql");
+    ASSERT.strictEqual(f.cql, "name = 'foo' AND type = 'bar'", "correct cql");
 
 };
 
 exports["test or"] = function() {
 
     var f = FILTER.or(["name = 'foo'", "type = 'bar'"]);
-    ASSERT.strictEqual(f.cql, "(name = 'foo' OR type = 'bar')", "correct cql");
+    ASSERT.strictEqual(f.cql, "name = 'foo' OR type = 'bar'", "correct cql");
 
 };