Skip to content

Commit

Permalink
insignificant merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
justinlewis committed Apr 18, 2017
2 parents 5892c07 + 406d6f5 commit c84de1c
Show file tree
Hide file tree
Showing 35 changed files with 1,067 additions and 277 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/**
* Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism.ontology;

@com.runwaysdk.business.ClassSignature(hash = -2105263295)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* later version.
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with Runway SDK(tm). If not, see
* <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,26 @@
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* later version.
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with Runway SDK(tm). If not, see
* <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism.data;

import java.io.InputStream;
import java.util.Arrays;
import java.util.List;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

Expand All @@ -38,6 +41,7 @@
import com.runwaysdk.system.gis.geo.GeoEntityDTO;
import com.runwaysdk.system.gis.geo.GeoEntityViewDTO;
import com.runwaysdk.system.gis.geo.LocatedInDTO;
import com.runwaysdk.system.gis.geo.SynonymDTO;
import com.runwaysdk.system.gis.geo.UniversalDTO;
import com.runwaysdk.util.IDGenerator;

Expand Down Expand Up @@ -171,6 +175,76 @@ public ResponseIF cancelEditingSession(ClientRequestIF request, @RequestParamter
return new RestBodyResponse("");
}

@Endpoint(error = ErrorSerialization.JSON)
public ResponseIF viewSynonyms(ClientRequestIF request, @RequestParamter(name = "entityId") String entityId) throws JSONException
{
GeoEntityDTO entity = GeoEntityDTO.get(request, entityId);

List<? extends SynonymDTO> synonyms = entity.getAllSynonym();
for (SynonymDTO syn : synonyms)
{
syn.lock();
}

ListSerializable list = new ListSerializable(synonyms);

return new RestBodyResponse(list);
}

@Endpoint(error = ErrorSerialization.JSON)
public ResponseIF applyEditSynonyms(ClientRequestIF request, @RequestParamter(name = "synonyms") String sjsonSynonyms) throws JSONException
{
JSONObject jobjSynonyms = new JSONObject(sjsonSynonyms);

String sParent = jobjSynonyms.getString("parent");

JSONArray synonyms = jobjSynonyms.getJSONArray("synonyms");

for (int i = 0; i < synonyms.length(); ++i)
{
JSONObject synonym = synonyms.getJSONObject(i);

String id = synonym.getString("id");
if (id.length() == 64)
{
SynonymDTO syn = SynonymDTO.get(request, id);
syn.getDisplayLabel().setValue(synonym.getString("displayLabel"));
syn.apply();
}
else
{
SynonymDTO syn = new SynonymDTO(request);
syn.getDisplayLabel().setValue(synonym.getString("displayLabel"));

SynonymDTO.create(request, syn, sParent);
}
}

JSONArray deleted = jobjSynonyms.getJSONArray("deleted");

for (int i = 0; i < deleted.length(); ++i)
{
String delId = deleted.getString(i);

SynonymDTO.get(request, delId).delete();
}

return new RestBodyResponse("");
}

@Endpoint(error = ErrorSerialization.JSON)
public ResponseIF cancelEditSynonyms(ClientRequestIF request, @RequestParamter(name = "synonyms") String synonymsJSONArray) throws JSONException
{
JSONArray synonyms = new JSONArray(synonymsJSONArray);

for (int i = 0; i < synonyms.length(); ++i)
{
SynonymDTO.get(request, synonyms.getString(i)).unlock();
}

return new RestBodyResponse("");
}

@Endpoint(error = ErrorSerialization.JSON)
public ResponseIF edit(ClientRequestIF request, @RequestParamter(name = "entityId") String entityId) throws JSONException
{
Expand Down
4 changes: 2 additions & 2 deletions geoprism-client/src/main/resources/jawr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ jawr.js.bundle.dynamic-map.mappings=/3rd-party/jquery-colorpicker/js/colpick.js,
# WebGL Map
jawr.js.bundle.dynamic-map-webgl.id=/bundles/webgl-map.js
#jawr.js.bundle.dynamic-map.mappings=/3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js
jawr.js.bundle.dynamic-map-webgl.mappings=/3rd-party/mapbox/mapboxgl/mapbox-gl-js-0.29.0/js/mapbox-gl.js, /3rd-party/mapbox/wellknown-5.0/wellknown.js, /3rd-party/mapbox/turf/v_2_0_2/turf.min.js, /3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js, /net/geoprism/widgets/SimpleMapWebGL.js, /net/geoprism/widgets/EditableMapWebGL.js
jawr.js.bundle.dynamic-map-webgl.mappings=/3rd-party/mapbox/mapboxgl/mapbox-gl-js-0.29.0/js/mapbox-gl.js, /3rd-party/mapbox/wellknown-5.0/wellknown.js, /3rd-party/mapbox/turf/v_2_0_2/turf.min.js, /3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js, /net/geoprism/widgets/SimpleMapWebGL.js, /net/geoprism/widgets/EditableMapWebGL.js, /3rd-party/proj4/proj4.js


# WebGL Map current
jawr.js.bundle.dynamic-map-webgl-current.id=/bundles/webgl-map-current.js
#jawr.js.bundle.dynamic-map.mappings=/3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js
#jawr.js.bundle.dynamic-map-webgl-current.mappings=/3rd-party/mapbox/mapboxgl/mapbox-gl-js-0.32.1/js/mapbox-gl.js, /3rd-party/mapbox/wellknown-5.0/wellknown.js, /3rd-party/mapbox/turf/v_2_0_2/turf.min.js, /3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js, /net/geoprism/widgets/SimpleMapWebGL.js, /net/geoprism/widgets/EditableMapWebGL.js
jawr.js.bundle.dynamic-map-webgl-current.mappings=/3rd-party/mapbox/mapboxgl/mapbox-gl-js-0.32.1/js/mapbox-gl.js, /3rd-party/mapbox/wellknown-5.0/wellknown.js, /3rd-party/mapbox/turf/v_2_0_2/turf.min.js, /3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js, /net/geoprism/widgets/SimpleMapWebGL.js, /net/geoprism/widgets/EditableMapWebGL.js
jawr.js.bundle.dynamic-map-webgl-current.mappings=/3rd-party/mapbox/mapboxgl/mapbox-gl-js-0.32.1/js/mapbox-gl.js, /3rd-party/mapbox/wellknown-5.0/wellknown.js, /3rd-party/mapbox/turf/v_2_0_2/turf.min.js, /3rd-party/jquery-colorpicker/js/colpick.js, /net/geoprism/Form.js, /net/geoprism/FeatureForm.js, /net/geoprism/MapFactoryWebGL.js, /net/geoprism/DynamicMap.js, /net/geoprism/widgets/SimpleMapWebGL.js, /net/geoprism/widgets/EditableMapWebGL.js, /3rd-party/proj4/proj4.js



Expand Down
18 changes: 18 additions & 0 deletions geoprism-common/src/main/java/net/geoprism/JSONStringImpl.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/**
* Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism;

import org.json.JSONString;
Expand Down
20 changes: 20 additions & 0 deletions geoprism-server/src/main/domain/(0001485389164474)EditGeometry.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<!--
Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
This file is part of Runway SDK(tm).
Runway SDK(tm) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Runway SDK(tm) is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
-->
<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<doIt>
<create></create>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<!--
Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
This file is part of Runway SDK(tm).
Runway SDK(tm) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Runway SDK(tm) is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
-->
<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<doIt>
<update>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<!--
Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
This file is part of Runway SDK(tm).
Runway SDK(tm) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Runway SDK(tm) is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
-->
<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<doIt>
<create></create>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<!--
Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
This file is part of Runway SDK(tm).
Runway SDK(tm) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Runway SDK(tm) is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
-->
<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<doIt>
<update>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<!--
Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
This file is part of Runway SDK(tm).
Runway SDK(tm) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Runway SDK(tm) is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
-->
<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<doIt>
<create></create>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/**
* Copyright (c) 2015 TerraFrame, Inc. All rights reserved.
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism.ontology;

@com.runwaysdk.business.ClassSignature(hash = 1722546625)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
*
* This file is part of Runway SDK(tm).
*
* Runway SDK(tm) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* later version.
* Runway SDK(tm) is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* Runway SDK(tm) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* Runway SDK(tm) is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with Runway SDK(tm). If not, see
* <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
*/
package net.geoprism.ontology;

Expand Down
Loading

0 comments on commit c84de1c

Please sign in to comment.