| 
| 
| 
|
+| 
| Your logo?!
| | | |
-If you encounter any issues with the software or if you would like to see
-certain functionality added, let us know at:
+
+### Funding organizations/projects
+
+The development the 52°North Sensor Observation Service implementations was supported by several organizations and projects. Among other we would like to thank the following organisations and project
+
+| Project/Logo | Description |
+| :-------------: | :------------- |
+| 
| The development of this version of the 52°North SOS was supported by the European FP7 research project NeXOS (co-funded by the European Commission under the grant agreement n°614102) |
+| 
| The development of this version of the 52°North SOS was supported by the German Federal Ministry of Education and Research research project COLABIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) |
+| 
| The development of this version of the 52°North SOS was supported by the Horizon 2020 research project SeaDataCloud (co-funded by the European Commission under the grant agreement n°730960) |
+| 
| The development of this version of the 52°North SOS was supported by the Horizon 2020 research project ODIP II (co-funded by the European Commission under the grant agreement n°654310) |
+| 
| The enhancements to make the 52°North SOS an INSPIRE compliant Download Service were funded by the JRC under the ISA Programme's Action 1.17: A Reusable INSPIRE Reference Platform (ARE3NA). |
+| 
| The IOOS project with the mission: 
| BRGM, the French geological survey, is France's reference public institution for Earth Science applications in the management of surface and subsurface resources and risks. |
+| 
| The Wupperverband for water, humans and the environment (Germany) |
+| 
| The Belgian Interregional Environment Agency (IRCEL - CELINE) is active in the domain of air quality (modelling, forecasts, informing the public on the state of their air quality, e-reporting to the EU under the air quality directives, participating in scientific research on air quality, etc.). IRCEL — CELINE is a permanent cooperation between three regional environment agencies: Agence wallonne de l'Air et du Climat (AWAC), Bruxelles Environnement - Leefmilieu Brussel and Vlaamse Milieumaatschappij (VMM). |
+| 
| The IVL Swedish Environmental Research Institute is an independent, non-profit research institute, owned by a foundation jointly established by the Swedish Government and Swedish industry. |
+| 
| The ITZBund Information Technology Services Centre of the Federal Government (Germany) |
+| 
| The German Aerospace Centre (Deutsches Zentrum fuer Luft- und Raumfahrt, DLR) and part of their Environmental and Crisis Information System (Umwelt- und Kriseninformationssystem, UKis) |
+| 
| The SMART Project, funded by the Ministry of Business, Innovation and Employment (07/2011 – 06/2017): 
| The development of this version of the 52°North SOS was supported by the European FP7 research project EO2HEAVEN (co-funded by the European Commission under the grant agreement n°244100) |
+| 
| The development of this version of the 52°North SOS was supported by the European FP7 research project GeoViQua (co-funded by the European Commission under the grant agreement n°265178) |
+| 
| The development of this version of the 52°North SOS was supported by the European FP7 research project GEOWOW (co-funded by the European Commission under the grant agreement n°282915) |
+
+## Contact
- Carsten Hollmann (c.hollmann@52north.org)
- Christian Autermann (c.autermann@52north.org)
- - Eike Hinderk Jürrens [@EHJ-52n](e.h.juerrens@52north.org)
+ - Eike Hinderk Jürrens [(EHJ-52n)](https://github.com/EHJ-52n/)
+
+## Download
-The Sensor Web Community
+The binaries of the 52N SOS releases are provided are provided with the releases on GitHub:
-52°North Inititative for Geospatial Open Source Software GmbH, Germany
+ https://github.com/52North/SOS/releases
+
+### Contents
+ * `/src` : The source files of 52°North SOS modules
+ * `/bin` : Executable binary of 52°North SOS webapp module
+ * `LICENSE` : The license of 52°North SOS
+ * `NOTICE` : Third Party libraries and their licenses
+ * `README` : This file
+ * `RELEASE-NOTES` : The release notes of the 52°North SOS
+
+No printer friendly documentation exist for this release. Instead, refer to the [wiki documentation](https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation).
---
-[1]: http://52north.org/communities/sensorweb/sos/index.html
-[2]: https://portal.opengeospatial.org/files/?artifact_id=47599
-[3]: http://www.ogcnetwork.net/ows-9
-[4]: http://cite.opengeospatial.org/test_engine
-[5]: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation
+## Support
+
+You can get support in the community mailing list and forums:
+
+ http://52north.org/resources/mailing-lists-and-forums/
+
+## License
+
+The 52N SOS is licenses under the [GNU General Public License v2 (GPLv2)](http://www.gnu.org/licenses/gpl-2.0.html).
+
+The used 3rd party libraries and under which they are licensed is listed in the [NOITICE file](https://github.com/52North/SOS/blob/develop/NOTICE)
+
+## Contribute
+
+You are interesting in contributing the 52°North SOS and you want to pull your changes to the 52N repository to make it available to all?
+
+In that case we need your official permission and for this purpose we have a so called contributors license agreement (CLA) in place. With this agreement you grant us the rights to use and publish your code under an open source license.
+
+A link to the contributors license agreement and further explanations are available here:
+
+ http://52north.org/about/licensing/cla-guidelines
+
+## Branches
+
+This project follows the [Gitflow branching model](http://nvie.com/posts/a-successful-git-branching-model/). "master" reflects the latest stable release.
+Ongoing development is done in branch [develop](../../tree/develop) and dedicated feature branches (feature-*).
+
+## Code Compilation
+
+This project is managed with Maven3. Simply run `mvn clean install`
+to create a deployable .WAR file.
+
+
+52°North Inititative for Geospatial Open Source Software GmbH, Germany
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 436d32c12b..a38998aa74 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -5,6 +5,42 @@ RELEASE NOTES
in Observation&Measurement), information about the sensor itself (encoded in a
SensorML instance document), and information about the sensor mounting platform
(SensorML as well).
+
+ Release 52n-sensorweb-sos-4.4.x
+====================================
+
+ --- New features ---
+
+ *
+
+ --- Changes ---
+
+ *
+
+ --- Fixed issues ---
+
+ *
+
+ Release 52n-sensorweb-sos-4.4.1
+====================================
+
+ --- New features ---
+
+ * Support for ReferencedObservation
+ * Support for insertion of profile observations via InsertResult/Template operations
+
+ --- Changes ---
+
+ * Load Microsoft SQL Server JDBC from Maven repository
+ * Improvements on cache serialization
+
+ --- Fixed issues ---
+
+ * Issue #566: Reload Capabilities Cache leads to severe error
+ * Issue #571: Sensors disappear (same as #566)
+ * Fix resetting of HIBERNATE_DIRECTORY config on save
+ * Fix the deletion of child observations
+ * Fix issue with not correct observation type for GWML GeologyLogCoverage
Release 52n-sensorweb-sos-4.4.0
====================================
@@ -101,6 +137,36 @@ RELEASE NOTES
* Avoid query for next value chunk if previous has less than chunk size
+ Release 52n-sensorweb-sos-4.3.16
+======================================
+
+ --- New features ---
+
+
+ --- Changes ---
+
+
+ --- Fixed issues ---
+
+ * Issue #566: Reload Capabilities Cache leads to severe error
+ * Issue #571: Sensors disappear (same as #566)
+
+
+ Release 52n-sensorweb-sos-4.3.15
+=====================================
+
+ --- New features ---
+
+
+ --- Changes ---
+
+
+ --- Fixed issues ---
+
+ * avoid orphaned session objects after re-configure SOS
+* prevents resetting HIBERNATE_DIRECTORY config (missing extension/readonly folder)
+
+
Release 52n-sensorweb-sos-4.3.14
=====================================
@@ -361,12 +427,12 @@ RELEASE NOTES
* Primary validated assessment data -modelled (E1b)
* Primary up-to-date assessment data - measurements (E2a)
* More information about AQD e-Reporting: http://www.eionet.europa.eu/aqportal
- * Documentation: https://wiki.52north.org/bin/view/SensorWeb/AqdEReporting
+ * Documentation: https://wiki.52north.org/SensorWeb/AqdEReporting
* Flexible identifier
* The flexible identifier extension offers the possibility to return human readable names
as identifiers instead of the sometimes cryptic identifiers.
* Affects offering, procedure, observableProperty and featureOfInterest.
- * Documentation: https://wiki.52north.org/bin/view/SensorWeb/FlexibleIdentifier
+ * Documentation: https://wiki.52north.org/SensorWeb/FlexibleIdentifier
* Add core and custom datasources for Oracle (#228)
* Support clear datasource for SQL Server (#199)
* Add webapp-bundle module which builds a 52N SOS war including
@@ -397,15 +463,15 @@ RELEASE NOTES
--- New features ---
* INSPIRE SOS:
- * Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#INSPIRE_Download_Service_extensi
+ * Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#INSPIRE_Download_Service_extensi
* Multilingualism:
* Name/description of offering, procedure, observableProperty, and featureOfInterest can be defined in different languages
* Define/Change via the admin interface, insertion via transactional operations is not yet supported.
- * Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#Multilingualism_support
+ * Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#Multilingualism_support
* Coordinate transformation:
* Requested coordinates are transformed to the defined database CRS
* Coordinates in the responses are transformed to the requested or defined response CRS
- *Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#CRS_support
+ *Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#CRS_support
*https://github.com/52North/SOS/pull/131
* Support for transactional feature relation insertion
* Insert valid sampledFeature feature and add relation to database
diff --git a/bindings/exi/pom.xml b/bindings/exi/pom.xml
index e951348871..19419b3e7d 100644
--- a/bindings/exi/pom.xml
+++ b/bindings/exi/pom.xml
@@ -4,7 +4,7 @@
true, if parameter is set
*/
public boolean isSetParameter() {
- return CollectionHelper.isNotEmpty(getParameter());
+ return parameterHolder != null && CollectionHelper.isNotEmpty(getParameter());
}
/**
@@ -572,21 +577,16 @@ public boolean isSetParameter() {
* @return true, if spatial filtering profile parameter is set
*/
public boolean isSetSpatialFilteringProfileParameter() {
- if (isSetParameter()) {
- for (NamedValue namedValue : getParameter()) {
- if (isSamplingGeometryParameter(namedValue)) {
- return true;
- }
- }
- }
- return false;
+ return parameterHolder.isSetSpatialFilteringProfileParameter();
}
/**
* Remove spatial filtering profile parameter
*/
public void removeSpatialFilteringProfileParameter() {
- removeParameter(getSpatialFilteringProfileParameter());
+ if (isSetSpatialFilteringProfileParameter()) {
+ removeParameter(getSpatialFilteringProfileParameter());
+ }
}
/**
@@ -596,7 +596,7 @@ public void removeSpatialFilteringProfileParameter() {
* Parameter to remove
*/
public void removeParameter(NamedValue parameter) {
- getParameter().remove(parameter);
+ getParameterHolder().removeParameter(parameter);
}
/**
@@ -607,10 +607,7 @@ public void removeParameter(NamedValue parameter) {
* @return this
*/
public OmObservation addSpatialFilteringProfileParameter(Geometry samplingGeometry) {
- final NamedValuetrue, if sampling geometry for spatial filtering
- * profile is set
- */
- private boolean isSamplingGeometryParameter(NamedValue namedValue) {
- return namedValue.isSetName() && namedValue.getName().isSetHref()
- && namedValue.getName().getHref().equals(OmConstants.PARAM_NAME_SAMPLING_GEOMETRY)
- && namedValue.getValue() instanceof GeometryValue;
- }
-
/**
* Check whether height parameter is set
*
* @return true, if height parameter is set
*/
public boolean isSetHeightParameter() {
- if (isSetParameter()) {
- for (NamedValue namedValue : getParameter()) {
- if (isHeightParameter(namedValue)) {
- return true;
- }
- }
- }
- return false;
+ return parameterHolder.isSetHeightParameter();
}
/**
@@ -664,25 +634,10 @@ public boolean isSetHeightParameter() {
*
* @return Height parameter
*/
- @SuppressWarnings("unchecked")
public NamedValuetrue, if depth parameter is set
*/
public boolean isSetDepthParameter() {
- if (isSetParameter()) {
- for (NamedValue namedValue : getParameter()) {
- if (isDepthParameter(namedValue)) {
- return true;
- }
- }
- }
- return false;
+ return parameterHolder.isSetDepthParameter();
}
/**
@@ -705,47 +653,19 @@ public boolean isSetDepthParameter() {
*
* @return Depth parameter
*/
- @SuppressWarnings("unchecked")
public NamedValuetrue, if height parameter is set
+ */
+ public boolean isSetHeightParameter() {
+ if (isSetParameter()) {
+ for (NamedValue namedValue : getParameter()) {
+ if (isHeightParameter(namedValue)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get height parameter
+ *
+ * @return Height parameter
+ */
+ @SuppressWarnings("unchecked")
+ public NamedValuetrue, if depth parameter is set
+ */
+ public boolean isSetDepthParameter() {
+ if (isSetParameter()) {
+ for (NamedValue namedValue : getParameter()) {
+ if (isDepthParameter(namedValue)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get depth parameter
+ *
+ * @return Depth parameter
+ */
+ @SuppressWarnings("unchecked")
+ public NamedValuetrue, if spatial filtering profile parameter is set
+ */
+ public boolean isSetSpatialFilteringProfileParameter() {
+ if (isSetParameter()) {
+ for (NamedValue namedValue : getParameter()) {
+ if (isSamplingGeometryParameter(namedValue)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Add sampling geometry to observation
+ *
+ * @param samplingGeometry
+ * The sampling geometry to set
+ * @return this
+ */
+ public ParameterHolder addSpatialFilteringProfileParameter(Geometry samplingGeometry) {
+ final NamedValuetrue, if sampling geometry for spatial filtering
+ * profile is set
+ */
+ private boolean isSamplingGeometryParameter(NamedValue namedValue) {
+ return namedValue.isSetName() && namedValue.getName().isSetHref()
+ && namedValue.getName().getHref().equals(OmConstants.PARAM_NAME_SAMPLING_GEOMETRY)
+ && namedValue.getValue() instanceof GeometryValue;
+ }
+}
diff --git a/core/api/src/main/java/org/n52/sos/ogc/om/values/DiscreteCoverage.java b/core/api/src/main/java/org/n52/sos/ogc/om/values/DiscreteCoverage.java
index d4fcc055a6..9a8410aaef 100644
--- a/core/api/src/main/java/org/n52/sos/ogc/om/values/DiscreteCoverage.java
+++ b/core/api/src/main/java/org/n52/sos/ogc/om/values/DiscreteCoverage.java
@@ -43,5 +43,17 @@ public interface DiscreteCoveragehttp://localhost:8080/52nSOS/sos or http://localhost:8080/52nSOS/service)."
+ " The path to a specific binding (like /soap) will appended to this URL."
- + " For detailed information, please read the documentation.");
+ + " For detailed information, please read the documentation.");
public static final StringSettingDefinition SENSOR_DIRECTORY_DEFINITION =
new StringSettingDefinition()
diff --git a/core/api/src/main/java/org/n52/sos/util/OMHelper.java b/core/api/src/main/java/org/n52/sos/util/OMHelper.java
index 71b8b0e11b..fb972dc8a8 100644
--- a/core/api/src/main/java/org/n52/sos/util/OMHelper.java
+++ b/core/api/src/main/java/org/n52/sos/util/OMHelper.java
@@ -43,11 +43,12 @@
import org.n52.sos.ogc.om.values.ComplexValue;
import org.n52.sos.ogc.om.values.CountValue;
import org.n52.sos.ogc.om.values.CvDiscretePointCoverage;
-import org.n52.sos.ogc.om.values.ProfileValue;
import org.n52.sos.ogc.om.values.GeometryValue;
import org.n52.sos.ogc.om.values.HrefAttributeValue;
import org.n52.sos.ogc.om.values.MultiPointCoverage;
import org.n52.sos.ogc.om.values.NilTemplateValue;
+import org.n52.sos.ogc.om.values.ProfileValue;
+import org.n52.sos.ogc.om.values.QuantityRangeValue;
import org.n52.sos.ogc.om.values.QuantityValue;
import org.n52.sos.ogc.om.values.RectifiedGridCoverage;
import org.n52.sos.ogc.om.values.ReferenceValue;
@@ -136,6 +137,8 @@ public static String getObservationTypeFor(final QName resultModel) {
return OmConstants.OBS_TYPE_TRUTH_OBSERVATION;
} else if (OmConstants.RESULT_MODEL_TEXT_OBSERVATION.equals(resultModel)) {
return OmConstants.OBS_TYPE_TEXT_OBSERVATION;
+ } else if (OmConstants.RESULT_MODEL_TEXT_OBSERVATION.equals(resultModel)) {
+ return OmConstants.OBS_TYPE_REFERENCE_OBSERVATION;
} else if (OmConstants.RESULT_MODEL_COMPLEX_OBSERVATION.equals(resultModel)) {
return OmConstants.OBS_TYPE_COMPLEX_OBSERVATION;
}
@@ -172,6 +175,8 @@ public static QName getQNameFor(final String observationType) {
return OmConstants.RESULT_MODEL_TRUTH_OBSERVATION;
case OmConstants.OBS_TYPE_TEXT_OBSERVATION:
return OmConstants.RESULT_MODEL_TEXT_OBSERVATION;
+ case OmConstants.OBS_TYPE_REFERENCE_OBSERVATION:
+ return OmConstants.RESULT_MODEL_REFERENCE_OBSERVATION;
case OmConstants.OBS_TYPE_COMPLEX_OBSERVATION:
return OmConstants.RESULT_MODEL_COMPLEX_OBSERVATION;
}
@@ -231,7 +236,7 @@ public String visit(QuantityValue value) {
@Override
public String visit(ReferenceValue value) {
- return defaultValue();
+ return OmConstants.OBS_TYPE_REFERENCE_OBSERVATION;
}
@Override
@@ -275,12 +280,12 @@ public String visit(CvDiscretePointCoverage value) throws OwsExceptionReport {
}
@Override
- public String visit(MultiPointCoverage multiPointCoverage) throws OwsExceptionReport {
+ public String visit(MultiPointCoverage value) throws OwsExceptionReport {
return defaultValue();
}
@Override
- public String visit(RectifiedGridCoverage rectifiedGridCoverage) throws OwsExceptionReport {
+ public String visit(RectifiedGridCoverage value) throws OwsExceptionReport {
return defaultValue();
}
@@ -288,5 +293,10 @@ public String visit(RectifiedGridCoverage rectifiedGridCoverage) throws OwsExcep
public String visit(ProfileValue value) throws OwsExceptionReport {
return GWMLConstants.OBS_TYPE_GEOLOGY_LOG;
}
+
+ @Override
+ public String visit(QuantityRangeValue value) throws OwsExceptionReport {
+ return defaultValue();
+ }
}
}
diff --git a/core/cache/pom.xml b/core/cache/pom.xml
index 77f6d433ae..b4362d169e 100644
--- a/core/cache/pom.xml
+++ b/core/cache/pom.xml
@@ -4,7 +4,7 @@
The 52°North SOS documentation is available in the 52°North Wiki.
+The 52°North SOS documentation is available in the 52°North Wiki.
-The user guide, including installation and configuration documentation, can be found here.
+The user guide, including installation and configuration documentation, can be found here.
-The developer guide can be found here.
+The developer guide can be found here.
If your SOS instance is publicly available please consider informing us or the community on swe@52north.org or use our forums so that many people can profit from your hard work. If you like, your SOS can also be listed in our Wiki as an example.
+If your SOS instance is publicly available please consider informing us or the community on swe@52north.org or use our forums so that many people can profit from your hard work. If you like, your SOS can also be listed in our Wiki as an example.
The best way to get to know a software is to use it! Implement features that you yourself need - new software, code snippets, adaptations, extensions, etc. Help others solve their problems. Fix bugs and enhance the existing software. There are many ways to get started!
diff --git a/spring/views/src/main/webapp/WEB-INF/views/index.jsp b/spring/views/src/main/webapp/WEB-INF/views/index.jsp index ec7d5ed270..f840e70adb 100644 --- a/spring/views/src/main/webapp/WEB-INF/views/index.jsp +++ b/spring/views/src/main/webapp/WEB-INF/views/index.jsp @@ -123,20 +123,19 @@
+ 
+ 
| The ITZBund Information Technology Services Centre of the Federal Government (Germany) |
+ Documentation for Oracle can be found here. - How to install the 52°North SOS with Oracle is described in the SOS wiki + How to install the 52°North SOS with Oracle is described in the SOS wiki
If you like to use MySQL 5.6.x you can find here a detailed installation guide for the different platforms @@ -68,7 +68,7 @@
If you like to use Microsoft SQL Server 2012 you can find detailed installation information on the Microsoft SQL Server Developer Network page. - How to install the 52°North SOS with SQL Server is described in the SOS wiki + How to install the 52°North SOS with SQL Server is described in the SOS wiki
" +
"" +
diff --git a/spring/views/src/main/webapp/static/images/funding/ConnectinGEO_logo.png b/spring/views/src/main/webapp/static/images/funding/ConnectinGEO_logo.png
new file mode 100644
index 0000000000..74d523c41f
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/ConnectinGEO_logo.png differ
diff --git a/spring/views/src/main/webapp/static/images/funding/bmbf_logo_en.png b/spring/views/src/main/webapp/static/images/funding/bmbf_logo_en.png
new file mode 100644
index 0000000000..654eee21af
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/bmbf_logo_en.png differ
diff --git a/spring/views/src/main/webapp/static/images/funding/logo_fixo3.png b/spring/views/src/main/webapp/static/images/funding/logo_fixo3.png
new file mode 100644
index 0000000000..25aeae7009
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/logo_fixo3.png differ
diff --git a/spring/views/src/main/webapp/static/images/funding/logo_itzbund.png b/spring/views/src/main/webapp/static/images/funding/logo_itzbund.png
new file mode 100644
index 0000000000..b6c36167d2
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/logo_itzbund.png differ
diff --git a/spring/views/src/main/webapp/static/images/funding/logo_seadatanet.png b/spring/views/src/main/webapp/static/images/funding/logo_seadatanet.png
new file mode 100644
index 0000000000..92ae96122a
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/logo_seadatanet.png differ
diff --git a/spring/views/src/main/webapp/static/images/funding/odip-logo.png b/spring/views/src/main/webapp/static/images/funding/odip-logo.png
new file mode 100644
index 0000000000..db00422e3b
Binary files /dev/null and b/spring/views/src/main/webapp/static/images/funding/odip-logo.png differ
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 579b435035..3d667830f9 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -3,7 +3,7 @@