import org.argeo.api.acr.Content;
import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.DName;
import org.argeo.api.acr.NamespaceUtils;
import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.acr.search.AndFilter;
import org.argeo.app.api.EntityName;
import org.argeo.app.api.EntityType;
import org.argeo.app.api.WGS84PosName;
+import org.argeo.app.api.geo.FeatureAdapter;
import org.argeo.app.geo.CqlUtils;
-import org.argeo.app.geo.GeoJSon;
+import org.argeo.app.geo.GeoJson;
import org.argeo.app.geo.GpxUtils;
import org.argeo.app.geo.JTS;
+import org.argeo.cms.acr.json.AcrJsonUtils;
import org.argeo.cms.http.HttpHeader;
import org.argeo.cms.http.server.HttpServerUtils;
import org.argeo.cms.util.LangUtils;
+import org.argeo.cms.util.StreamUtils;
import org.geotools.data.DataUtilities;
import org.geotools.data.geojson.GeoJSONWriter;
import org.geotools.feature.DefaultFeatureCollection;
if (cql != null) {
CqlUtils.filter(search.from(path), cql);
} else {
- search.from(path).where((and) -> {
- });
+ search.from(path);
}
// search.getWhere().any((f) -> {
for (QName typeName : typeNames) {
featureAdapter = featureAdapters.get(typeName);
}
- Geometry defaultGeometry = featureAdapter != null ? featureAdapter.getDefaultGeometry(c, typeName)
- : getDefaultGeometry(c);
- if (defaultGeometry == null)
- return;
- generator.writeStartObject();
- generator.write("type", "Feature");
- String featureId = getFeatureId(c);
- if (featureId != null)
- generator.write("id", featureId);
- GeoJSon.writeBBox(generator, defaultGeometry);
- GeoJSon.writeGeometry(generator, defaultGeometry);
-
- generator.writeStartObject("properties");
- writeTimeProperties(generator, c);
- writeProperties(generator, c);
+ boolean geometryWritten = false;
+// if (typeName.getLocalPart().equals("fieldSimpleFeature")) {
+// Content area = c.getContent("place.geom.json").orElse(null);
+// if (area != null) {
+// generator.writeStartObject();
+// generator.write("type", "Feature");
+// String featureId = getFeatureId(c);
+// if (featureId != null)
+// generator.write("id", featureId);
+//
+// generator.flush();
+// try (InputStream in = area.open(InputStream.class)) {
+// out.write(",\"geometry\":".getBytes());
+// StreamUtils.copy(in, out);
+// //out.flush();
+// } catch (Exception e) {
+// log.error(c.getPath() + " : " + e.getMessage());
+// } finally {
+// }
+// geometryWritten = true;
+// }else {
+// return;
+// }
+// }
+
+ if (!geometryWritten) {
+
+ Geometry defaultGeometry = featureAdapter != null ? featureAdapter.getDefaultGeometry(c, typeName)
+ : getDefaultGeometry(c);
+ if (defaultGeometry == null)
+ return;
+ generator.writeStartObject();
+ generator.write("type", "Feature");
+ String featureId = getFeatureId(c);
+ if (featureId != null)
+ generator.write("id", featureId);
+
+// GeoJson.writeBBox(generator, defaultGeometry);
+ generator.writeStartObject(GeoJson.GEOMETRY);
+ GeoJson.writeGeometry(generator, defaultGeometry);
+ generator.writeEnd();// geometry object
+ }
+ generator.writeStartObject(GeoJson.PROPERTIES);
+ AcrJsonUtils.writeTimeProperties(generator, c);
if (featureAdapter != null)
featureAdapter.writeProperties(generator, c, typeName);
+ else
+ writeProperties(generator, c);
generator.writeEnd();// properties object
generator.writeEnd();// feature object
return uuid;
}
- private final QName JCR_CREATED = NamespaceUtils.parsePrefixedName("jcr:created");
-
- private final QName JCR_LAST_MODIFIED = NamespaceUtils.parsePrefixedName("jcr:lastModified");
-
- protected void writeTimeProperties(JsonGenerator g, Content content) {
- String creationDate = content.attr(DName.creationdate);
- if (creationDate == null)
- creationDate = content.attr(JCR_CREATED);
- if (creationDate != null)
- g.write(DName.creationdate.get(), creationDate);
- String lastModified = content.attr(DName.getlastmodified);
- if (lastModified == null)
- lastModified = content.attr(JCR_LAST_MODIFIED);
- if (lastModified != null)
- g.write(DName.getlastmodified.get(), lastModified);
- }
-
- protected void writeProperties(JsonGenerator generator, Content content) {
+ public void writeProperties(JsonGenerator generator, Content content) {
String path = content.getPath();
generator.write("path", path);
if (content.hasContentClass(EntityType.local)) {