nbproject/private/private.xml
| @@ -24,11 +24,11 @@ |
| <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/STest.java</file> |
| </group> |
| <group> |
| - <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/intersect/V1_0.java</file> |
| - <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/union/V1_0.java</file> |
| - <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/buffer/V1_0.java</file> |
| + <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/Database.java</file> |
| <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/LocalStringUtils.java</file> |
| + <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/minboundingrectangle/V1_0.java</file> |
| <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/PostgresqlDatabase.java</file> |
| + <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/DatabaseBuilder.java</file> |
| </group> |
| </open-files> |
| </project-private> |
src/java/m/gis/ApplicationConfig.java
| @@ -40,7 +40,7 @@ |
| resources.add(csip.ReportService.class); |
| resources.add(m.gis.buffer.V1_0.class); |
| resources.add(m.gis.intersect.V1_0.class); |
| - resources.add(m.gis.minboundingrectangle.V1_0.class); |
| + resources.add(m.gis.minboundingcircle.V1_0.class); |
| resources.add(m.gis.union.V1_0.class); |
| } |
| } |
src/java/m/gis/buffer/V1_0.java
| @@ -65,12 +65,7 @@ |
| |
| @Override |
| protected void postProcess() throws Exception { |
| - if (result.length() <= 1) { |
| - putResult("layer", result.get(0)); |
| - } |
| - else { |
| - putResult("layer", result); |
| - } |
| + putResult("layer", result); |
| } |
| |
| } |
src/java/m/gis/intersect/V1_0.java
| @@ -29,7 +29,7 @@ |
| @Path("m/intersect/1.0") |
| public class V1_0 extends ModelDataService { |
| |
| - JSONObject result; |
| + JSONArray result; |
| GeoJSON layers; |
| Layer resultLayer; |
| ArrayList<Layer> operationLayers; |
| @@ -46,6 +46,7 @@ |
| .setAll() |
| .create(); |
| JSONArray geojson = getJSONArrayParam("layer"); |
| + result = new JSONArray(); |
| layers = new GeoJSON(geojson, db); |
| operationLayers = new ArrayList<>(); |
| } |
| @@ -61,7 +62,7 @@ |
| operationLayers.add(resultLayer); |
| } |
| } |
| - result = db.toJSON(resultLayer); |
| + result.put(db.toJSON(resultLayer)); |
| return EXEC_OK; |
| } |
| |
src/java/m/gis/intersect/V1_0.json
| @@ -1,106 +1,106 @@ |
| { |
| - "metainfo":{ |
| + "metainfo":{ |
| |
| - }, |
| - "parameter":[ |
| - { |
| - "name":"layer", |
| - "value":[ |
| - { |
| - "type":"Feature", |
| - "properties":{ |
| - "name": "first", |
| - "acres": 1.2 |
| - }, |
| - "geometry":{ |
| - "type":"Polygon", |
| - "coordinates":[ |
| - [ |
| - [ |
| - -104.98844146728516, |
| - 40.71675324247426 |
| - ], |
| - [ |
| - -104.98496532440186, |
| - 40.71899759605726 |
| - ], |
| - [ |
| - -104.98136043548584, |
| - 40.71903012236453 |
| - ], |
| - [ |
| - -104.98140335083008, |
| - 40.714313641889106 |
| - ], |
| - [ |
| - -104.9874973297119, |
| - 40.714476284709335 |
| - ], |
| - [ |
| - -104.98844146728516, |
| - 40.71675324247426 |
| - ] |
| - ] |
| + }, |
| + "parameter":[ |
| + { |
| + "name":"layer", |
| + "value":[ |
| + { |
| + "type":"Feature", |
| + "properties":{ |
| + "name":"first", |
| + "acres":1.2 |
| + }, |
| + "geometry":{ |
| + "type":"Polygon", |
| + "coordinates":[ |
| + [ |
| + [ |
| + -104.98844146728516, |
| + 40.71675324247426 |
| + ], |
| + [ |
| + -104.98496532440186, |
| + 40.71899759605726 |
| + ], |
| + [ |
| + -104.98136043548584, |
| + 40.71903012236453 |
| + ], |
| + [ |
| + -104.98140335083008, |
| + 40.714313641889106 |
| + ], |
| + [ |
| + -104.9874973297119, |
| + 40.714476284709335 |
| + ], |
| + [ |
| + -104.98844146728516, |
| + 40.71675324247426 |
| + ] |
| + ] |
| + ] |
| + } |
| + }, |
| + { |
| + "type":"Feature", |
| + "properties":{ |
| + "name":"second", |
| + "acres":2.1 |
| + }, |
| + "geometry":{ |
| + "type":"MultiPolygon", |
| + "coordinates":[ |
| + [ |
| + [ |
| + [ |
| + -104.99234676361084, |
| + 40.718444646402055 |
| + ], |
| + [ |
| + -104.9870252609253, |
| + 40.7221525738643 |
| + ], |
| + [ |
| + -104.98342037200928, |
| + 40.71981074897111 |
| + ], |
| + [ |
| + -104.98384952545165, |
| + 40.71577741296778 |
| + ], |
| + [ |
| + -104.99234676361084, |
| + 40.718444646402055 |
| ] |
| - } |
| - }, |
| - { |
| - "type":"Feature", |
| - "properties":{ |
| - "name": "second", |
| - "acres": 2.1 |
| - }, |
| - "geometry":{ |
| - "type":"MultiPolygon", |
| - "coordinates":[ |
| - [ |
| - [ |
| - [ |
| - -104.99234676361084, |
| - 40.718444646402055 |
| - ], |
| - [ |
| - -104.9870252609253, |
| - 40.7221525738643 |
| - ], |
| - [ |
| - -104.98342037200928, |
| - 40.71981074897111 |
| - ], |
| - [ |
| - -104.98384952545165, |
| - 40.71577741296778 |
| - ], |
| - [ |
| - -104.99234676361084, |
| - 40.718444646402055 |
| - ] |
| - ] |
| - ], |
| - [ |
| - [ |
| - [ |
| - -104.9899435043335, |
| - 40.7139883550567 |
| - ], |
| - [ |
| - -104.98573780059814, |
| - 40.71551718935035 |
| - ], |
| - [ |
| - -104.98651027679442, |
| - 40.71268719183457 |
| - ], |
| - [ |
| - -104.9899435043335, |
| - 40.7139883550567 |
| - ] |
| - ] |
| - ] |
| + ] |
| + ], |
| + [ |
| + [ |
| + [ |
| + -104.9899435043335, |
| + 40.7139883550567 |
| + ], |
| + [ |
| + -104.98573780059814, |
| + 40.71551718935035 |
| + ], |
| + [ |
| + -104.98651027679442, |
| + 40.71268719183457 |
| + ], |
| + [ |
| + -104.9899435043335, |
| + 40.7139883550567 |
| ] |
| - } |
| - } |
| - ] |
| - } |
| - ] |
| + ] |
| + ] |
| + ] |
| + } |
| + } |
| + ] |
| + } |
| + ] |
| } |
| \ No newline at end of file |
src/java/m/gis/union/V1_0.java
| @@ -29,7 +29,7 @@ |
| @Path("m/union/1.0") |
| public class V1_0 extends ModelDataService { |
| |
| - JSONObject result; |
| + JSONArray result; |
| GeoJSON layers; |
| Layer resultLayer; |
| ArrayList<Layer> operationLayers; |
| @@ -46,6 +46,7 @@ |
| .setAll() |
| .create(); |
| JSONArray geojson = getJSONArrayParam("layer"); |
| + result = new JSONArray(); |
| layers = new GeoJSON(geojson, db); |
| operationLayers = new ArrayList<>(); |
| } |
| @@ -61,7 +62,7 @@ |
| operationLayers.add(resultLayer); |
| } |
| } |
| - result = db.toJSON(resultLayer); |
| + result.put(db.toJSON(resultLayer)); |
| return EXEC_OK; |
| } |
| |
src/java/m/gis/union/V1_0.json
| @@ -1,96 +1,96 @@ |
| { |
| - "metainfo":{ |
| + "metainfo":{ |
| |
| - }, |
| - "parameter":[ |
| - { |
| - "name":"layer", |
| - "value":[ |
| - { |
| - "type":"Feature", |
| - "properties":{ |
| - "name":"first" |
| - }, |
| - "geometry":{ |
| - "type":"Polygon", |
| - "coordinates":[ |
| - [ |
| - [ |
| - -104.98968601226807, |
| - 40.71610269105921 |
| - ], |
| - [ |
| - -104.98659610748291, |
| - 40.71906264865593 |
| - ], |
| - [ |
| - -104.98419284820555, |
| - 40.71636291238809 |
| - ], |
| - [ |
| - -104.9877119064331, |
| - 40.714476284709335 |
| - ], |
| - [ |
| - -104.98968601226807, |
| - 40.71610269105921 |
| - ] |
| - ] |
| + }, |
| + "parameter":[ |
| + { |
| + "name":"layer", |
| + "value":[ |
| + { |
| + "type":"Feature", |
| + "properties":{ |
| + "name":"first" |
| + }, |
| + "geometry":{ |
| + "type":"Polygon", |
| + "coordinates":[ |
| + [ |
| + [ |
| + -104.98968601226807, |
| + 40.71610269105921 |
| + ], |
| + [ |
| + -104.98659610748291, |
| + 40.71906264865593 |
| + ], |
| + [ |
| + -104.98419284820555, |
| + 40.71636291238809 |
| + ], |
| + [ |
| + -104.9877119064331, |
| + 40.714476284709335 |
| + ], |
| + [ |
| + -104.98968601226807, |
| + 40.71610269105921 |
| + ] |
| + ] |
| + ] |
| + } |
| + }, |
| + { |
| + "type":"Feature", |
| + "properties":{ |
| + "name":"second" |
| + }, |
| + "geometry":{ |
| + "type":"MultiPolygon", |
| + "coordinates":[ |
| + [ |
| + [ |
| + [ |
| + -104.99341964721678, |
| + 40.7219574249367 |
| + ], |
| + [ |
| + -104.98784065246582, |
| + 40.72543749493236 |
| + ], |
| + [ |
| + -104.98363494873047, |
| + 40.72205499947202 |
| + ], |
| + [ |
| + -104.99341964721678, |
| + 40.7219574249367 |
| ] |
| - } |
| - }, |
| - { |
| - "type":"Feature", |
| - "properties":{ |
| - "name":"second" |
| - }, |
| - "geometry":{ |
| - "type":"MultiPolygon", |
| - "coordinates":[ |
| - [ |
| - [ |
| - [ |
| - -104.99341964721678, |
| - 40.7219574249367 |
| - ], |
| - [ |
| - -104.98784065246582, |
| - 40.72543749493236 |
| - ], |
| - [ |
| - -104.98363494873047, |
| - 40.72205499947202 |
| - ], |
| - [ |
| - -104.99341964721678, |
| - 40.7219574249367 |
| - ] |
| - ] |
| - ], |
| - [ |
| - [ |
| - [ |
| - -104.9833345413208, |
| - 40.72156712536507 |
| - ], |
| - [ |
| - -104.97934341430664, |
| - 40.722412771544384 |
| - ], |
| - [ |
| - -104.97663974761961, |
| - 40.718119379753475 |
| - ], |
| - [ |
| - -104.9833345413208, |
| - 40.72156712536507 |
| - ] |
| - ] |
| - ] |
| + ] |
| + ], |
| + [ |
| + [ |
| + [ |
| + -104.9833345413208, |
| + 40.72156712536507 |
| + ], |
| + [ |
| + -104.97934341430664, |
| + 40.722412771544384 |
| + ], |
| + [ |
| + -104.97663974761961, |
| + 40.718119379753475 |
| + ], |
| + [ |
| + -104.9833345413208, |
| + 40.72156712536507 |
| ] |
| - } |
| - } |
| - ] |
| - } |
| - ] |
| + ] |
| + ] |
| + ] |
| + } |
| + } |
| + ] |
| + } |
| + ] |
| } |
| \ No newline at end of file |