Applied small patches from Markus Shaber

git-svn-id: http://svn.osgeo.org/postgis/trunk@1350 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/jdbc2/src/org/postgis/Point.java b/jdbc2/src/org/postgis/Point.java
index 801dc3493bb26352ee99a5b645bf815cac366f61..d0f5c1a7e381b9d09fb575b4aaa2de685fca988e 100644 (file)
--- a/jdbc2/src/org/postgis/Point.java
+++ b/jdbc2/src/org/postgis/Point.java
@@ -6,6 +6,8 @@ import java.sql.SQLException;
 
 public class Point extends Geometry {
 
+    public static final boolean CUTINTS=true;
+    
     public int hashCode() {
         return super.hashCode() ^ hashCode(x) ^ hashCode(y) ^ hashCode(z) ^ hashCode(m);
     }
@@ -109,15 +111,26 @@ public class Point extends Geometry {
 
     public void innerWKT(StringBuffer sb) {
         sb.append(x);
+        if (CUTINTS) cutint(sb);
         sb.append(' ');
         sb.append(y);
+        if (CUTINTS) cutint(sb);
         if (dimension == 3) {
             sb.append(' ');
             sb.append(z);
+            if (CUTINTS) cutint(sb);
         }
         if (haveMeasure) {
             sb.append(' ');
             sb.append(m);
+            if (CUTINTS) cutint(sb);
+        }
+    }
+
+    private static void cutint(StringBuffer sb) {
+        int l = sb.length()-2;
+        if ((sb.charAt(l+1)=='0')&&(sb.charAt(l)=='.')) {
+            sb.setLength(l);
         }
     }
 

diff --git a/jdbc2/src/org/postgis/binary/ValueGetter.java b/jdbc2/src/org/postgis/binary/ValueGetter.java
index 027200ca2236ff5f5dca82fa574df6c88ffef3d5..ee497e1d592d6879203540cc633d4b6ad2415f0a 100644 (file)
--- a/jdbc2/src/org/postgis/binary/ValueGetter.java
+++ b/jdbc2/src/org/postgis/binary/ValueGetter.java
@@ -83,12 +83,7 @@ public abstract class ValueGetter {
         }
 
         protected int getInt(int index) {
-            int hg = data.get(index + 3);
-            int high = ((int) hg << 24);
-            int hmed = ((int) data.get(index + 2) << 16);
-            int lmed = ((int) data.get(index + 1) << 8);
-            int low = (int) data.get(index);
-            return high + hmed + lmed + low;
+            return (data.get(index + 3) << 24) + (data.get(index + 2) << 16) + (data.get(index + 1) << 8) + data.get(index);
         }
 
         protected long getLong(int index) {

diff --git a/jdbc2/todo.txt b/jdbc2/todo.txt
index f3461728fd1cc6604dbfff2e1fc15a1917286ea1..1d8e79292dd9d52c63924097fd3d97a6ed816ec3 100644 (file)
--- a/jdbc2/todo.txt
+++ b/jdbc2/todo.txt
@@ -29,3 +29,6 @@ Todo for PostGIS 1.0 compatible JDBC classes
 
 - Possibly relicensing under LGPL
 
+- Possibly adding server side code to support plJava
+  http://gborg.postgresql.org/project/pljava/projdisplay.php
+