Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: afb328c1 by Tony Chemit at 2020-12-27T12:33:15+01:00 l'information nombre total d'opération de pêches sur le formulaire marée me semble un peu faible ? - Closes #1695 - - - - - 20be6d67 by Tony Chemit at 2020-12-27T12:45:56+01:00 Impossible d'ouvrir la configuration - Closes #1701 - - - - - 72505b35 by Tony Chemit at 2020-12-27T17:20:41+01:00 Configuration de la cartographie - See #1702 Utilisation nouvelles zones zee - - - - - 3d16f0de by Tony Chemit at 2020-12-27T17:21:05+01:00 Configuration de la cartographie - See #1702 Mise en place de la configuration de certaines couleurs à améliorer - - - - - 29 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java - + client/datasource/editor/common/src/main/map/shapeFiles/zee/LICENSE_EEZ_v11.txt - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml - − client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.cpg - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.dbf - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.gpkg - client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj → client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.prj - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.qpj - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shp - + client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shx - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss - client/datasource/editor/ll/src/main/resources/map/ll-style.xml - client/datasource/editor/ps/src/main/resources/map/ps-style.xml - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/dto/src/main/java/fr/ird/observe/dto/data/TripMapConfig.java - models/dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -532,7 +532,7 @@ defaultValue = ${resources.directory}/map/shapeFiles/borders/WDBII_border_l_L1.s description = observe.config.map.layer5.description key = map.layer5.path type = file -defaultValue = ${resources.directory}/map/shapeFiles/zee/World_EEZ_v8_2014.shp +defaultValue = ${resources.directory}/map/shapeFiles/zee/eez_v11_lowres.shp [option mapLayer6] description = observe.config.map.layer6.description @@ -565,12 +565,66 @@ key = map.ps.style.path type = file defaultValue = ${resources.directory}/map/ps-style.xml +[option mapPsStyleObservationsColor] +description = observe.config.map.ps.style.observations.color +key = map.ps.style.observations.color +type = color +defaultValue = java.awt.Color[r=0,g=255,b=0] + [option mapLlStyleFile] description = observe.config.map.ll.style.description key = map.ll.style.path type = file defaultValue = ${resources.directory}/map/ll-style.xml +[option mapLlStyleObservationsLineTripColor] +description = observe.config.map.ll.style.observations.line.trip.color +key = map.ll.style.observations.line.trip.color +type = color +defaultValue = java.awt.Color[r=0,g=255,b=0] + +[option mapLlStyleObservationsLineSettingColor] +description = observe.config.map.ll.style.observations.line.setting.color +key = map.ll.style.observations.line.setting.color +type = color +defaultValue = java.awt.Color[r=0,g=255,b=0] + +[option mapLlStyleObservationsLineHaulingColor] +description = observe.config.map.ll.style.observations.line.hauling.color +key = map.ll.style.observations.line.hauling.color +type = color +defaultValue = java.awt.Color[r=255,g=255,b=0] + +[option mapLlStyleObservationsPointColor] +description = observe.config.map.ll.style.observations.point.color +key = map.ll.style.observations.point.color +type = color +defaultValue = java.awt.Color[r=0,g=255,b=0] + +[option mapLlStyleLogbookLineTripColor] +description = observe.config.map.ll.style.logbook.line.trip.color +key = map.ll.style.logbook.line.trip.color +type = color +defaultValue = java.awt.Color[r=34,g=34,b=34] + +[option mapLlStyleLogbookLineSettingColor] +description = observe.config.map.ll.style.logbook.line.setting.color +key = map.ll.style.logbook.line.setting.color +type = color +defaultValue = java.awt.Color[r=255,g=0,b=0] + +[option mapLlStyleLogbookLineHaulingColor] +description = observe.config.map.ll.style.logbook.line.hauling.color +key = map.ll.style.logbook.line.hauling.color +type = color +defaultValue = java.awt.Color[r=0,g=255,b=255] + +[option mapLlStyleLogbookPointColor] +description = observe.config.map.ll.style.logbook.point.color +key = map.ll.style.logbook.point.color +type = color +defaultValue = java.awt.Color[r=255,g=0,b=0] + [option validationSpeedEnable] description = observe.config.validation.speedEnable key = validation.speedEnable @@ -758,25 +812,25 @@ defaultValue = {\"fr.ird.referential.common.Species#1239832684290#0.046805073247 [option temporaryFilesTimeout] description = observe.config.client.temporaryFiles.timeout.description key = observe.config.client.temporaryFilesTimeout -type = int +type = Integer defaultValue = 120 [option logFilesTimeout] description = observe.config.client.logFiles.timeout.description key = observe.config.client.logFilesTimeout -type = int +type = Integer defaultValue = 720 [option feedbackFilesTimeout] description = observe.config.client.feedbackFiles.timeout.description key = observe.config.client.feedbackFilesTimeout -type = int +type = Integer defaultValue = 720 [option backupFilesTimeout] description = observe.config.client.backupFiles.timeout.description key = observe.config.client.backupFilesTimeout -type = int +type = Integer defaultValue = 2160 [action help] ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -53,7 +53,16 @@ observe.config.map.layer7.description observe.config.map.layer8.description observe.config.map.layer9.description observe.config.map.ll.style.description +observe.config.map.ll.style.logbook.line.hauling.color +observe.config.map.ll.style.logbook.line.setting.color +observe.config.map.ll.style.logbook.line.trip.color +observe.config.map.ll.style.logbook.point.color +observe.config.map.ll.style.observations.line.hauling.color +observe.config.map.ll.style.observations.line.setting.color +observe.config.map.ll.style.observations.line.trip.color +observe.config.map.ll.style.observations.point.color observe.config.map.ps.style.description +observe.config.map.ps.style.observations.color observe.config.navigationIconsPath.description observe.config.observation.activitysDetaillees observe.config.observation.fauneAssociee ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -72,6 +72,7 @@ import org.nuiton.version.Versions; import javax.swing.UIDefaults; import javax.swing.UIManager; +import java.awt.Color; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; @@ -247,6 +248,10 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig UIManager.getDefaults().put("DecoratorService", (UIDefaults.LazyValue) table -> new DecoratorService(referentialLocale)); } + public static String getColorToHex(Color color) { + return String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue()); + } + public ClientConfig() { this(DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); } ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -303,7 +303,16 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.MAP_BACKGROUND_COLOR); ClientConfig.MAP_LAYERS.forEach(helper::addOption); helper.addOption(ClientConfigOption.MAP_PS_STYLE_FILE); + helper.addOption(ClientConfigOption.MAP_PS_STYLE_OBSERVATIONS_COLOR); helper.addOption(ClientConfigOption.MAP_LL_STYLE_FILE); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_TRIP_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_SETTING_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_HAULING_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_POINT_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_TRIP_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_SETTING_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_HAULING_COLOR); + helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_POINT_COLOR); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.map; * #L% */ +import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.dto.data.TripMapConfig; import fr.ird.observe.dto.data.TripMapConfigDto; @@ -30,6 +31,8 @@ import fr.ird.observe.dto.data.TripMapDto; import fr.ird.observe.dto.data.TripMapPoint; import fr.ird.observe.dto.data.TripMapPointType; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.geotools.data.FileDataStore; import org.geotools.data.FileDataStoreFinder; import org.geotools.data.simple.SimpleFeatureSource; @@ -59,12 +62,16 @@ import org.opengis.referencing.FactoryException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; @@ -84,18 +91,39 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil protected static final String LOGBOOK_POINTS_LAYER_NAME = "Logbook points"; protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd"); - + private static final Logger log = LogManager.getLogger(TripMapContentBuilderSupport.class); protected final List<ObserveMapPaneLegendItem> legendItems; protected final List<TripMapPoint> notValidPoints = new LinkedList<>(); protected final Set<TripMapPointType> acceptedTripPointTypes; protected MapContent mapContent; protected StyledLayerDescriptor styledLayerDescriptor; + public static TripMapContentBuilderSupport of(TripMapConfig config, TripMapConfigDto tripMapConfig, TripMapDto tripMapDto, List<TripMapPoint> tripMapPoints) throws Exception { TripMapContentBuilderSupport builder = (TripMapContentBuilderSupport) config.getTripMapContentBuilders().stream().filter(t -> t.accept(tripMapDto)).findFirst().orElseThrow(IllegalStateException::new); builder.reset(); File styleFile = builder.getStyleFile(config.getMapDirectory().toPath()); - builder.setStyledLayerDescriptor(styleFile); + String content = Files.readString(styleFile.toPath()); + + Map<String, String> replaceMapping = new LinkedHashMap<>(); + replaceMapping.put("mapPsStyleObservationsColor", ClientConfig.getColorToHex(config.getMapPsStyleObservationsColor())); + replaceMapping.put("mapLlStyleObservationsLineTripColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineTripColor())); + replaceMapping.put("mapLlStyleObservationsLineSettingColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineSettingColor())); + replaceMapping.put("mapLlStyleObservationsLineHaulingColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineHaulingColor())); + replaceMapping.put("mapLlStyleObservationsPointColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsPointColor())); + replaceMapping.put("mapLlStyleLogbookLineTripColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineTripColor())); + replaceMapping.put("mapLlStyleLogbookLineSettingColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineSettingColor())); + replaceMapping.put("mapLlStyleLogbookLineHaulingColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineHaulingColor())); + replaceMapping.put("mapLlStyleLogbookPointColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookPointColor())); + + for (Map.Entry<String, String> entry : replaceMapping.entrySet()) { + content = content.replaceAll("\\$\\{" + entry.getKey() + "}", entry.getValue()); + } + + Path newPath = config.getTemporaryDirectory().toPath().resolve("map-temp" + System.nanoTime()); + + Files.write(newPath, content.getBytes(StandardCharsets.UTF_8)); + builder.setStyledLayerDescriptor(newPath.toFile()); for (File layerFile : config.getMapLayerFiles()) { builder.addLayer(layerFile); } ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/LICENSE_EEZ_v11.txt ===================================== @@ -0,0 +1,33 @@ +LICENSE, TERMS OF USE & CITATION +LICENSE +Marine Regions’ data is licensed under CC-By (https://creativecommons.org/licenses/by/4.0/). +Please contact us for other uses of the Licensed Material beyond license terms. +We kindly request our users not to make our products available for download elsewhere and to always refer to marineregions.org for the most up-to-date products and services. + + +TERMS OF USE +Marine Regions is not meant to be used for legal, economical (in the sense of exploration of natural resources) or navigational purposes. +It is developed solely for scientific, educational and research purposes.. + +VLIZ can in no case be held accountable or liable for faults, of any nature, that might occur in the usage of Marine Regions. +All those who wish to use Marine Regions do so completely at own risk/under own responsibility and according to the License conditions and the Terms of Use. +VLIZ expresses no opinion about the legal state neither of any country, territory or area nor concerning its delimitation, frontier or borders. +The data has no legal value whatsoever. + +Marine Regions can be used according to the terms and conditions mentioned in the CC-BY license (CC-BY, https://creativecommons.org/licenses/by/4.0/). +The provisions above in no way replace the provisions of the CC-license. +If any of the abovementioned provisions divert from or contradict the provisions of the CC-license in any way, the CC-license provisions prevail. + + +FEEDBACK +If Marine Regions' data is used for a publication or product, we kindly request to inform us (info@marineregions.org) and we'll add the publication to our users page (https://marineregions.org/stats_pubs.php). + +Feedback of the users of Marine Regions is more than welcome. +In case you notice mistakes, incompleteness or are willing to join us in this endeavor, please contact us on info@marineregions.org. + + +CITATION +Flanders Marine Institute (2019). Maritime Boundaries Geodatabase: Maritime Boundaries and Exclusive Economic Zones (200NM), version 11. Available online at https://www.marineregions.org/. https://doi.org/10.14284/386 + + + ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf deleted ===================================== Binary files a/client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf and /dev/null differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn deleted ===================================== Binary files a/client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn and /dev/null differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx deleted ===================================== Binary files a/client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx and /dev/null differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp deleted ===================================== Binary files a/client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp and /dev/null differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml deleted ===================================== @@ -1,166 +0,0 @@ -<!-- - #%L - ObServe Client :: DataSource :: Editor :: Common - %% - Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program 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 General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<metadata xml:lang="nl"><Esri><CreaDate>20131014</CreaDate><CreaTime>13354700</CreaTime><SyncOnce>FALSE</SyncOnce><SyncDate>20140227</SyncDate><SyncTime>14430500</SyncTime><ModDate>20140227</ModDate><ModTime>14430500</ModTime><DataProperties><lineage><Process ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\CalculateField" Date="20120906" Time="120028" Name="" export="">CalculateField World_Maritime_Boundaries_v7 LastChange [Remarks] VB #</Process></lineage><itemProps><imsContentType export="False"/><itemName Sync="TRUE">World_EEZ_v8_2014</itemName><nativeExtBox><westBL Sync="TRUE">-180.000000</westBL><eastBL Sync="TRUE">180.000000</eastBL><southBL Sync="TRUE">-85.470291</southBL><northBL Sync="TRUE">87.023944</northBL><exTypeCode Sync="TRUE">1</exTypeCode></nativeExtBox><itemSize Sync="TRUE">4.856</itemSize><itemLocation><linkage Sync="TRUE">file://\\fs\shared\datac\geo\marbound\versioning\v8\World_EEZ_v8_2014.shp</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><coordRef><type Sync="TRUE">Geographic</type><geogcsn Sync="TRUE">GCS_WGS_1984</geogcsn><csUnits Sync="TRUE">Angular Unit: Degree (0.017453)</csUnits><peXml Sync="TRUE"><GeographicCoordinateSystem xsi:type='typens:GeographicCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.1'><WKT>GEOGCS[&quot;GCS_WGS_1984&quot;,DATUM[&quot;D_WGS_1984&quot;,SPHEROID[&quot;WGS_1984&quot;,6378137.0,298.257223563]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433],AUTHORITY[&quot;EPSG&quot;,4326]]</WKT><XOrigin>-400</XOrigin><YOrigin>-400</YOrigin><XYScale>11258999068426.238</XYScale><ZOrigin>-100000</ZOrigin><ZScale>10000</ZScale><MOrigin>-100000</MOrigin><MScale>10000</MScale><XYTolerance>8.983152841195215e-009</XYTolerance><ZTolerance>0.001</ZTolerance><MTolerance>0.001</MTolerance><HighPrecision>true</HighPrecision><LeftLongitude>-180</LeftLongitude><WKID>4326</WKID><LatestWKID>4326</LatestWKID></GeographicCoordinateSystem></peXml></coordRef></DataProperties><ArcGISFormat>1.0</ArcGISFormat><ArcGISstyle>INSPIRE Metadata Directive</ArcGISstyle><scaleRange><minScale>150000000</minScale><maxScale>20000000</maxScale></scaleRange><ArcGISProfile>INSPIRE</ArcGISProfile></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"/><origin>REQUIRED: The name of an organization or individual that developed the data set.</origin><pubdate>REQUIRED: The date when the data set is published or otherwise made available for release.</pubdate><title Sync="TRUE">World_Maritime_Boundaries_v6_201001</title><ftname Sync="TRUE">World_Maritime_Boundaries_v6_201001</ftname><geoform Sync="TRUE">vector digital data</geoform></citeinfo></citation><native Sync="TRUE">Microsoft Windows Vista Version 6.1 (Build 7600) ; ESRI ArcCatalog 9.3.0.1770</native><descript><langdata Sync="TRUE">nl</langdata><abstract>REQUIRED: A brief narrative summary of the data set.</abstract><purpose>REQUIRED: A summary of the intentions with which the data set was developed.</purpose></descript><timeperd><current>REQUIRED: The basis on which the time period of content information is determined.</current><timeinfo><sngdate><caldate>REQUIRED: The year (and optionally month, or month and day) for which the data set corresponds to the ground.</caldate></sngdate></timeinfo></timeperd><status><progress>REQUIRED: The state of the data set.</progress><update>REQUIRED: The frequency with which changes and additions are made to the data set after the initial data set is completed.</update></status><spdom><bounding><westbc Sync="TRUE">-180.000000</westbc><eastbc Sync="TRUE">180.000000</eastbc><northbc Sync="TRUE">87.023944</northbc><southbc Sync="TRUE">-75.118695</southbc></bounding><lboundng><leftbc Sync="TRUE">-180.000000</leftbc><rightbc Sync="TRUE">180.000000</rightbc><bottombc Sync="TRUE">-75.118695</bottombc><topbc Sync="TRUE">87.023944</topbc></lboundng></spdom><keywords><theme><themekt>REQUIRED: Reference to a formally registered thesaurus or a similar authoritative source of theme keywords.</themekt><themekey>REQUIRED: Common-use word or phrase used to describe the subject of the data set.</themekey></theme></keywords><accconst>REQUIRED: Restrictions and legal prerequisites for accessing the data set.</accconst><useconst>REQUIRED: Restrictions and legal prerequisites for using the data set after access is granted.</useconst><natvform Sync="TRUE">Shapefile</natvform></idinfo><distInfo xmlns=""><distFormat xmlns=""><formatName>Shapefile</formatName><formatVer>version 8</formatVer></distFormat><distTranOps><transSize Sync="TRUE">4.856</transSize></distTranOps></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE">C:\Documents and Settings\nathalied\Desktop\EEZ\Boundaries\boundaries2008</srcused><date Sync="TRUE">20081027</date><time Sync="TRUE">14580500</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><date Sync="TRUE">20081104</date><time Sync="TRUE">15584900</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><date Sync="TRUE">20090401</date><time Sync="TRUE">12304600</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><date Sync="TRUE">20090430</date><time Sync="TRUE">14261200</time></procstep><procstep><procdesc Sync="TRUE">Dataset moved.</procdesc><srcused Sync="TRUE">S:\datac\Geo\marbound\versioning\World_Maritime_Boundaries_v3_20090430</srcused><date Sync="TRUE">20090430</date><time Sync="TRUE">14313000</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><procdate Sync="TRUE">20090812</procdate><proctime Sync="TRUE">09544100</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><date Sync="TRUE">20090929</date><time Sync="TRUE">09394000</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><date Sync="TRUE">20090929</date><time Sync="TRUE">12465300</time></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><procdate Sync="TRUE">20100105</procdate><proctime Sync="TRUE">09054300</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE">G:\marbound\versioning\2011-03-30_v6.0\World_Maritime_Boundaries_v6_20110330</srcused><procdate Sync="TRUE">20110512</procdate><proctime Sync="TRUE">14152400</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"/><procdate Sync="TRUE">20120229</procdate><proctime Sync="TRUE">10425100</proctime></procstep></lineage></dataqual><dataIdInfo><envirDesc Sync="TRUE">Microsoft Windows 7 Version 6.1 (Build 7601) Service Pack 1; Esri ArcGIS 10.1.0.3035</envirDesc><dataLang><languageCode Sync="FALSE" value="eng"/><countryCode value="BEL" Sync="TRUE"/></dataLang><idCitation xmlns=""><resTitle Sync="FALSE">World Exclusive Economic Zones, version 8 (Feb 2014)</resTitle><presForm xmlns=""><PresFormCd Sync="TRUE" value="005"/></presForm><date><createDate>2006-01-01T00:00:00</createDate><pubDate>2014-02-28T00:00:00</pubDate><reviseDate>2014-02-28T00:00:00</reviseDate></date><resEd>version 8</resEd><citRespParty xmlns=""><editorSource>external</editorSource><editorDigest>b0aa41157cc86c0e15ab9e548e380455</editorDigest><rpIndName>Nathalie De Hauwere</rpIndName><rpOrgName>Flanders Marine Institute, VLIZ</rpOrgName><rpPosName>Scientific Assistant, GIS</rpPosName><role><RoleCd value="009"/></role><rpCntInfo xmlns=""><cntAddress addressType=""><eMailAdd>info@marineregions.org</eMailAdd></cntAddress></rpCntInfo><editorSave>True</editorSave><displayName>Nathalie De Hauwere</displayName></citRespParty><citRespParty xmlns=""><editorSource>external</editorSource><editorDigest>2afebd71ff8d7be96285e12198f57419</editorDigest><rpIndName>Simon Claus</rpIndName><rpOrgName>Flanders Marine Institute, VLIZ</rpOrgName><rpPosName>Project Manager</rpPosName><role><RoleCd value="008"/></role><rpCntInfo xmlns=""><cntAddress addressType=""><eMailAdd>info@marineregions.org</eMailAdd></cntAddress></rpCntInfo><editorSave>True</editorSave><displayName>Simon Claus</displayName></citRespParty><citRespParty xmlns=""><rpIndName>Francisco Souza Dias</rpIndName><rpOrgName>Flanders Marine Institute</rpOrgName><rpPosName>Scientific Assistant</rpPosName><role><RoleCd value="007"/></role></citRespParty><citRespParty xmlns=""><rpIndName>Bart Vanhoorne</rpIndName><rpOrgName>Flanders Marine Institute</rpOrgName><rpPosName>IT expert</rpPosName><role><RoleCd value="007"/></role></citRespParty><citRespParty xmlns=""><rpIndName>Francisco Hernandez</rpIndName><rpOrgName>Flanders Marine Institute</rpOrgName><rpPosName>Manager data centre</rpPosName><role><RoleCd value="007"/></role></citRespParty></idCitation><spatRpType><SpatRepTypCd Sync="TRUE" value="001"/></spatRpType><dataExt xmlns=""><geoEle xmlns=""><GeoBndBox esriExtentType="native"><westBL Sync="TRUE">-180</westBL><eastBL Sync="TRUE">180</eastBL><northBL Sync="TRUE">87.023944</northBL><southBL Sync="TRUE">-75.118695</southBL><exTypeCode Sync="TRUE">1</exTypeCode></GeoBndBox></geoEle><geoEle xmlns=""><GeoDesc><exTypeCode>0</exTypeCode><geoId xmlns=""><identCode>World</identCode></geoId></GeoDesc></geoEle><exDesc>WGS 1984</exDesc></dataExt><geoBox esriExtentType="decdegrees"><westBL Sync="TRUE">-180</westBL><eastBL Sync="TRUE">180</eastBL><northBL Sync="TRUE">87.023944</northBL><southBL Sync="TRUE">-75.118695</southBL><exTypeCode Sync="TRUE">1</exTypeCode></geoBox><idPurp>This dataset represents the polygons of the Exclusive Economic Zones (EEZ) of the world, in a lower resolution: the coastline is based on the World Countries Shapefile from ESRI. -The data set of the Exclusive Economic Zones can be used in many applications. In biogeography for example, it is possible to create for instance species distribution lists per country.</idPurp><idAbs><DIV STYLE="text-align:Left;"><DIV><DIV><P STYLE="margin:0 0 0 0;"><SPAN>Two global GIS-covers in ESRI shape format were produced: one contains polylines representing the maritime boundaries;the second holds polygons representing the EEZs. When all the boundary lines were constructed, the lines could be aggregated and an EEZ-polygon per country was derived. For the land-side border, the boundaries of the world countries were used, on the sea-side the boundaries were aggregated for each country. Separate polygons were created for islands (ex.: Azores) and dependencies (ex.: Réunion) but those polygons are linked with their corresponding sovereign nation (in the attribute table).</SPAN></P></DIV></DIV></DIV></idAbs><idCredit>Flanders Marine Institute (2014). Marineregions.org. Accessed at http://www.marineregions.org on yyyy-mm-dd.</idCredit><searchKeys><keyword>Exclusive Economic Zone</keyword><keyword>Boundaries</keyword><keyword>World</keyword><keyword>200 NM</keyword><keyword>Disputed</keyword><keyword>Treaties</keyword><keyword>Administrative Units</keyword></searchKeys><resConst><Consts xmlns=""><useLimit><DIV STYLE="text-align:Left;"><DIV><DIV><DIV STYLE="font-size:12pt"><P><SPAN STYLE="font-size:10pt">Disclaimer: </SPAN></P><P><SPAN STYLE="font-size:10pt">The Flanders Marine Institute manages Marine Regions, but is aware that it is not complete and undoubtedly contains errors. The Flanders Marine Institute cannot be made responsible for any errors or misuse of data contained in this register. Comments from our users are more than welcome, so if you come across any error or incomplete information or you are willing to contribute to this initiative please contact us.</SPAN></P><P><SPAN STYLE="font-size:10pt">The data is provided "as is", and no warranty express, implied or otherwise is offered as to the data's accuracy. The developers do not imply any opinion concerning the legal status of any country, territory or area, or concerning the delimitation of its frontiers or boundaries. The data can be used for educational, scientific or research purposes but should not be used for legal, commercial/economical (exploration of natural resources) or navigational purposes.</SPAN></P><P><SPAN STYLE="font-size:10pt">Anyone can download this data but it is for the sole use of the organisation or individual downloading the data. The geodata may not be redistributed without the permission of the Flanders Marine Institute (VLIZ). The geodata may be used in a Value-Added Software Application (like webservices), on condition that the Flanders Marine Institute is acknowledged as the source of the data. Redistribution rights are granted for hard-copy renditions or static, electronic map images (e.g. jpeg, gif, etc.) that are plotted, printed or publicly displayed with reference to the Flanders Marine Institute. For redistribution rights of derived products, please contact us. You can contact us at info@marineregions.org</SPAN></P></DIV></DIV></DIV></DIV></useLimit></Consts></resConst><placeKeys xmlns=""><keyword>World</keyword></placeKeys><dataChar><CharSetCd value="004"/></dataChar><resMaint xmlns=""><maintFreq><MaintFreqCd value="008"/></maintFreq></resMaint><idPoC xmlns=""><rpIndName>Nathalie De Hauwere</rpIndName><rpOrgName>Flanders Marine Institute, VLIZ</rpOrgName><rpPosName>Scientific Assistant, GIS</rpPosName><role><RoleCd value="007"/></role><rpCntInfo xmlns=""><cntAddress addressType=""><eMailAdd>info@marineregions.org</eMailAdd></cntAddress></rpCntInfo><displayName>Nathalie De Hauwere</displayName><displayName>Nathalie De Hauwere</displayName></idPoC><resConst><LegConsts xmlns=""><accessConsts><RestrictCd value="006"/></accessConsts><useConsts><RestrictCd value="006"/></useConsts></LegConsts></resConst><dataExt xmlns=""><geoEle xmlns=""><GeoBndBox esriExtentType="search"><exTypeCode Sync="TRUE">1</exTypeCode><westBL Sync="TRUE">-180.000000</westBL><eastBL Sync="TRUE">180.000000</eastBL><northBL Sync="TRUE">87.023944</northBL><southBL Sync="TRUE">-85.470291</southBL></GeoBndBox></geoEle></dataExt><tpCat><TopicCatCd value="003"/></tpCat><tpCat><TopicCatCd value="014"/></tpCat></dataIdInfo><metainfo><langmeta Sync="TRUE">nl</langmeta><metstdn Sync="TRUE">FGDC Content Standards for Digital Geospatial Metadata</metstdn><metstdv Sync="TRUE">FGDC-STD-001-1998</metstdv><mettc Sync="TRUE">local time</mettc><metc><cntinfo><cntorgp><cntper>REQUIRED: The person responsible for the metadata information.</cntper><cntorg>REQUIRED: The organization responsible for the metadata information.</cntorg></cntorgp><cntaddr><addrtype>REQUIRED: The mailing and/or physical address for the organization or individual.</addrtype><city>REQUIRED: The city of the address.</city><state>REQUIRED: The state or province of the address.</state><postal>REQUIRED: The ZIP or other postal code of the address.</postal></cntaddr><cntvoice>REQUIRED: The telephone number by which individuals can speak to the organization or individual.</cntvoice></cntinfo></metc><metd Sync="TRUE">20110128</metd></metainfo><mdLang><languageCode Sync="FALSE" value="eng"/><countryCode value="BEL" Sync="TRUE"/></mdLang><mdStanName Sync="TRUE">ISO 19115 Geographic Information - Metadata</mdStanName><mdStanVer Sync="TRUE">DIS_ESRI1.0</mdStanVer><mdChar><CharSetCd Sync="TRUE" value="004"/></mdChar><mdHrLv><ScopeCd Sync="TRUE" value="005"/></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><distinfo><resdesc Sync="TRUE">Downloadable Data</resdesc><stdorder><digform><digtinfo><transize Sync="TRUE">1.071</transize><dssize Sync="TRUE">1.071</dssize></digtinfo></digform></stdorder></distinfo><spdoinfo><direct Sync="TRUE">Vector</direct><ptvctinf><esriterm Name="World_EEZ_v8_2014"><efeatyp Sync="TRUE">Simple</efeatyp><efeageom code="4" Sync="TRUE"></efeageom><esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">249</efeacnt><spindex Sync="TRUE">FALSE</spindex><linrefer Sync="TRUE">FALSE</linrefer></esriterm></ptvctinf></spdoinfo><spref><horizsys><cordsysn><geogcsn Sync="TRUE">GCS_WGS_1984</geogcsn></cordsysn><geograph><geogunit Sync="TRUE">Decimal degrees</geogunit><latres Sync="TRUE">0.000000</latres><longres Sync="TRUE">0.000000</longres></geograph><geodetic><horizdn Sync="TRUE">D_WGS_1984</horizdn><ellips Sync="TRUE">WGS_1984</ellips><semiaxis Sync="TRUE">6378137.000000</semiaxis><denflat Sync="TRUE">298.257224</denflat></geodetic></horizsys></spref><refSysInfo><RefSystem dimension=""><refSysID xmlns=""><identCode Sync="TRUE" code="eez_boundaries" value="4326">GCS_WGS_1984</identCode><idVersion>8</idVersion><idCodeSpace Sync="TRUE">EPSG</idCodeSpace><identAuth xmlns=""><resTitle>WGS 84</resTitle><date><reviseDate>2014-02-28T00:00:00</reviseDate></date><resEd>8</resEd><resEdDate>20140228</resEdDate></identAuth></refSysID></RefSystem></refSysInfo><mdDateSt Sync="TRUE">20140227</mdDateSt><Binary><Thumbnail><Data EsriPropertyType="PictureX">/9j/4AAQSkZJRgABAQEAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a -HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACFAMgDASIA -AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA -AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 -ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm -p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA -AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx -BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK -U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 -uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii -gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooqoNQQ7j5 -Uu1ZDGWAHUHHTOamU4x+J2At0VSOpRKxVkYFeoLoCPr81NbVoOEU4kYhVUsrcn2BJ9T+Bqfaw3uO -zL9FYl9qiwR/JcCeVjhYlkCDOM9QCR+uawY9a1K4gkkGmxFQCA5V32H1LEdODwcfXPFZrEcyvCLY -WOz+1W//AD3i/wC+xR9rtv8An4i/77FedXGteIbm6aJZUVedpj/dowJ4O48jgHqe2fejSr3VJZFF -xqUwJQsj5aRGGcdFxtPU/MeeOO9Uqk7XaX9fILHopu7YdbiIf8DFH2u2/wCfiL/vsVy2nQyzQPLe -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</Data></Thumbnail></Binary><mdContact xmlns=""><rpIndName>Nathalie De Hauwere</rpIndName><rpOrgName>Flanders Marine Institute, VLIZ</rpOrgName><rpPosName>Scientific Assistant, GIS</rpPosName><role><RoleCd value="007"/></role><rpCntInfo xmlns=""><cntAddress addressType=""><eMailAdd>info@marineregions.org</eMailAdd></cntAddress></rpCntInfo><displayName>Nathalie De Hauwere</displayName></mdContact><mdMaint xmlns=""><maintFreq><MaintFreqCd value="008"/></maintFreq><maintCont xmlns=""><rpIndName>Nathalie De Hauwere</rpIndName><rpOrgName>Flanders Marine Institute, VLIZ</rpOrgName><rpPosName>Scientific Assistant, GIS</rpPosName><role><RoleCd value="007"/></role><rpCntInfo xmlns=""><cntAddress addressType=""><eMailAdd>info@marineregions.org</eMailAdd></cntAddress></rpCntInfo><displayName>Nathalie De Hauwere</displayName><displayName>Nathalie De Hauwere</displayName></maintCont></mdMaint><mdConst><Consts xmlns=""><useLimit><DIV STYLE="text-align:Left;"><DIV><P><SPAN>The Flanders Marine Institute manages Marine Regions, but is aware that it is not complete and undoubtedly contains errors. The Flanders Marine Institute cannot be made responsible for any errors or misuse of data contained in this register. Comments from our users are more than welcome, so if you come across any error or incomplete information or you are willing to contribute to this initiative please contact us.</SPAN></P><P><SPAN>The data is provided "as is", and no warranty express, implied or otherwise is offered as to the data's accuracy. The developers do not imply any opinion concerning the legal status of any country, territory or area, or concerning the delimitation of its frontiers or boundaries. The data can be used for educational, scientific or research purposes but should not be used for legal, commercial/economical (exploration of natural resources) or navigational purposes.</SPAN></P><P><SPAN>Anyone can download this data but it is for the sole use of the organisation or individual downloading the data. The geodata may not be redistributed without the permission of the Flanders Marine Institute (VLIZ). The geodata may be used in a Value-Added Software Application (like webservices), on condition that the Flanders Marine Institute is acknowledged as the source of the data. Redistribution rights are granted for hard-copy renditions or static, electronic map images (e.g. jpeg, gif, etc.) that are plotted, printed or publicly displayed with reference to the Flanders Marine Institute. For redistribution rights of derived products, please contact us. You can contact us at info@marineregions.org</SPAN></P></DIV></DIV></useLimit></Consts></mdConst><mdConst><LegConsts xmlns=""><accessConsts><RestrictCd value="006"/></accessConsts><useConsts><RestrictCd value="006"/></useConsts></LegConsts></mdConst><mdFileID>http://geo.vliz.be/geoserver/MarineRegions/wms?service=WMS&version=1.1.0&request=GetMap&layers=MarineRegions:boundaries</mdFileID><mdParentID>Marine Regions</mdParentID><dataSetURI>http://geo.vliz.be/geoserver/MarineRegions/wms?service=WMS&version=1.1.0&request=GetMap&layers=MarineRegions:boundaries</dataSetURI><dqInfo xmlns=""><dqScope><scpLvl><ScopeCd value="005"/></scpLvl></dqScope><dataLineage><statement>Updates for Maritime Boundaries (EEZ) version 8 - - -- Singapore - Malaysia - -- New boundary between Colombia and Nicaragua - -- Malta (Continental Shelf) - -- Guyana - Suriname - - -- Norway: create seperate polygon for the Fisheries Protection Zone around - -- Boundary Morocco - Mauritania - -- Maritime Dispute Chile-Peru - -- Split Guadeloupe and Martinique - -- Split US Virgin Islands and Puerto Rico - -- ISO Codes - -- Error in the western boundary of the Wallis & Futuna EEZ - -- Boundary Kenya - Somalia - -- Boundary UK - France, Celtic Sea - -- Boundary China/North Korea is disputed - -- Change terminology: 'disputed' in 'median line - disputed' - -- Boundary Tuvalu-Kiribati: agreed boundary: - -- Boundary New Caledonia (with Australia/Norfolk Island): continental shelf instead of EEZ - -- Congo (Kinshasa) has claimed 200 NM / territorial sea / baselines / and continental shelf - -- Include metadata in downloadfiles - -- Update boundary Palmyra Atoll, based on http://www.nauticalcharts.noaa.gov/csdl/mbound.htm - -- Vanuatu EEZ boundary - -- Trinidad & Tobago + Barbados + Venezuela</statement></dataLineage></dqInfo><eainfo><detailed Name="World_EEZ_v8_2014" xmlns=""><enttyp><enttypl Sync="TRUE">World_EEZ_v8_2014</enttypl><enttypt Sync="TRUE">Feature Class</enttypt><enttypc Sync="TRUE">249</enttypc></enttyp><attr xmlns=""><attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr xmlns=""><attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias><attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Coordinates defining the features.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">OBJECTID</attrlabl><attalias Sync="TRUE">OBJECTID</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">9</attwidth><atprecis Sync="TRUE">9</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">ID</attrlabl><attalias Sync="TRUE">ID</attalias><attrtype Sync="TRUE">SmallInteger</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">4</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">EEZ</attrlabl><attalias Sync="TRUE">EEZ</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">200</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Country</attrlabl><attalias Sync="TRUE">Country</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">100</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Sovereign</attrlabl><attalias Sync="TRUE">Sovereign</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">100</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Remarks</attrlabl><attalias Sync="TRUE">Remarks</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">150</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Sov_ID</attrlabl><attalias Sync="TRUE">Sov_ID</attalias><attrtype Sync="TRUE">SmallInteger</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">4</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">EEZ_ID</attrlabl><attalias Sync="TRUE">EEZ_ID</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">9</attwidth><atprecis Sync="TRUE">9</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">ISO_3digit</attrlabl><attalias Sync="TRUE">ISO_3digit</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">5</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">MRGID</attrlabl><attalias Sync="TRUE">MRGID</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Date_chang</attrlabl><attalias Sync="TRUE">Date_chang</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">50</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Area_m2</attrlabl><attalias Sync="TRUE">Area_m2</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">17</attwidth><atprecis Sync="TRUE">16</atprecis><attscale Sync="TRUE">12</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Longitude</attrlabl><attalias Sync="TRUE">Longitude</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">17</attwidth><atprecis Sync="TRUE">16</atprecis><attscale Sync="TRUE">12</attscale></attr><attr xmlns=""><attrlabl Sync="TRUE">Latitude</attrlabl><attalias Sync="TRUE">Latitude</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">17</attwidth><atprecis Sync="TRUE">16</atprecis><attscale Sync="TRUE">12</attscale></attr><attr><attrlabl Sync="TRUE">MRGID_EEZ</attrlabl><attalias Sync="TRUE">MRGID_EEZ</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">9</attwidth><atprecis Sync="TRUE">9</atprecis><attscale Sync="TRUE">0</attscale></attr></detailed></eainfo><spatRepInfo><VectSpatRep><geometObjs Name="World_EEZ_v8_2014"><geoObjTyp><GeoObjTypCd value="002" Sync="TRUE"></GeoObjTypCd></geoObjTyp><geoObjCnt Sync="TRUE">249</geoObjCnt></geometObjs><topLvl><TopoLevCd value="001" Sync="TRUE"></TopoLevCd></topLvl></VectSpatRep></spatRepInfo></metadata> ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx deleted ===================================== Binary files a/client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx and /dev/null differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.cpg ===================================== @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.dbf ===================================== Binary files /dev/null and b/client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.dbf differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.gpkg ===================================== Binary files /dev/null and b/client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.gpkg differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj → client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.prj ===================================== @@ -1 +1 @@ -GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.qpj ===================================== @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shp ===================================== Binary files /dev/null and b/client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shp differ ===================================== client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shx ===================================== Binary files /dev/null and b/client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shx differ ===================================== client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -30,26 +30,29 @@ observe.data.ll.common.GearUseFeatures.generalTab observe.data.ll.common.GearUseFeatures.measurementsTab observe.data.ll.common.GearUseFeatures.number observe.data.ll.common.GearUseFeatures.usedInTrip -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount +observe.data.ll.common.Trip.associatedActivityCount +observe.data.ll.common.Trip.associatedFishingOperationCount observe.data.ll.common.Trip.availableData observe.data.ll.common.Trip.ersId observe.data.ll.common.Trip.generalComment observe.data.ll.common.Trip.generalTab -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount +observe.data.ll.common.Trip.logbookActivityCount observe.data.ll.common.Trip.logbookAvailability observe.data.ll.common.Trip.logbookComment observe.data.ll.common.Trip.logbookDataEntryOperator observe.data.ll.common.Trip.logbookDataQuality +observe.data.ll.common.Trip.logbookFishingOperationCount observe.data.ll.common.Trip.logbookTab observe.data.ll.common.Trip.mapTab observe.data.ll.common.Trip.noOfCrewMembers observe.data.ll.common.Trip.noOfDays observe.data.ll.common.Trip.observationMethod -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount +observe.data.ll.common.Trip.observationsActivityCount observe.data.ll.common.Trip.observationsAvailability observe.data.ll.common.Trip.observationsComment observe.data.ll.common.Trip.observationsDataEntryOperator observe.data.ll.common.Trip.observationsDataQuality +observe.data.ll.common.Trip.observationsFishingOperationCount observe.data.ll.common.Trip.observationsTab observe.data.ll.common.Trip.species observe.data.ll.common.Trip.species.selected ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx ===================================== @@ -180,12 +180,19 @@ </cell> </row> - <!-- associatedActivityAndFishingOperationCount --> + <!-- associatedActivityCount --> + <!-- associatedFishingOperationCount --> <row> <cell columns='2'> - <JPanel id='associatedActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model"> - <JLabel id='associatedActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> - <JLabel id='associatedActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + <JPanel id='associatedActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model"> + <JPanel id='associatedActivityPanel' layout="{new BorderLayout()}"> + <JLabel id='associatedActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='associatedActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> + <JPanel id='associatedFishingOperationCountPanel' layout="{new BorderLayout()}"> + <JLabel id='associatedFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='associatedFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> </JPanel> </cell> </row> @@ -267,12 +274,20 @@ <JaxxComboBox id='observationsDataQuality' genericType='DataQualityReference' constructorParams='this'/> </cell> </row> - <!-- observationsActivityAndFishingOperationCount --> + <!-- observationsActivityCount --> + <!-- observationsFishingOperationCount --> <row> <cell columns='2'> - <JPanel id='observationsActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model"> - <JLabel id='observationsActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> - <JLabel id='observationsActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + <JPanel id='observationsActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model"> + <JPanel id='observationsActivityCountPanel' layout="{new BorderLayout()}"> + <JLabel id='observationsActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='observationsActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> + <JPanel id='observationsFishingOperationCountPanel' layout="{new BorderLayout()}"> + <JLabel id='observationsFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='observationsFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> + </JPanel> </cell> </row> @@ -309,12 +324,20 @@ <JaxxComboBox id='logbookDataQuality' genericType='DataQualityReference' constructorParams='this'/> </cell> </row> - <!-- logbookActivityAndFishingOperationCount --> + <!-- logbookActivityCount --> + <!-- logbookFishingOperationCount --> <row> <cell columns='2' weightx="1"> - <JPanel id='logbookActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model"> - <JLabel id='logbookActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> - <JLabel id='logbookActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + <JPanel id='logbookActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model"> + <JPanel id='logbookActivityCountPanel' layout="{new BorderLayout()}"> + <JLabel id='logbookActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='logbookActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> + <JPanel id='logbookFishingOperationCountPanel' layout="{new BorderLayout()}"> + <JLabel id='logbookFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/> + <JLabel id='logbookFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/> + </JPanel> + </JPanel> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss ===================================== @@ -20,19 +20,34 @@ * #L% */ -#associatedActivityAndFishingOperationCount { +#associatedActivityCount { font-weight:bold; - text:{" " + bean.getAssociatedActivityAndFishingOperationCount()}; + text:{" " + bean.getAssociatedActivityCount()}; } -#observationsActivityAndFishingOperationCount { +#associatedFishingOperationCount { font-weight:bold; - text:{" " + bean.getObservationsActivityAndFishingOperationCount()}; + text:{" " + bean.getAssociatedFishingOperationCount()}; } -#logbookActivityAndFishingOperationCount { +#observationsActivityCount { font-weight:bold; - text:{" " + bean.getLogbookActivityAndFishingOperationCount()}; + text:{" " + bean.getObservationsActivityCount()}; +} + +#observationsFishingOperationCount { + font-weight:bold; + text:{" " + bean.getObservationsFishingOperationCount()}; +} + +#logbookActivityCount { + font-weight:bold; + text:{" " + bean.getLogbookActivityCount()}; +} + +#logbookFishingOperationCount { + font-weight:bold; + text:{" " + bean.getLogbookFishingOperationCount()}; } #startDate { ===================================== client/datasource/editor/ll/src/main/resources/map/ll-style.xml ===================================== @@ -17,10 +17,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<StyledLayerDescriptor version="1.0.0" - xmlns="http://www.opengis.net/sld" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<StyledLayerDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" + version="1.0.0" + xmlns="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd"> @@ -117,7 +117,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#00FF00</CssParameter> + <CssParameter name="stroke">${mapLlStyleObservationsLineTripColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> <CssParameter name="stroke-dasharray">5 7</CssParameter> </Stroke> @@ -135,7 +135,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#00FF00</CssParameter> + <CssParameter name="stroke">${mapLlStyleObservationsLineSettingColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> </Stroke> </LineSymbolizer> @@ -152,7 +152,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#FFFF00</CssParameter> + <CssParameter name="stroke">${mapLlStyleObservationsLineHaulingColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> </Stroke> </LineSymbolizer> @@ -176,7 +176,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#222222</CssParameter> + <CssParameter name="stroke">${mapLlStyleLogbookLineTripColor}</CssParameter> <CssParameter name="stroke-width">3</CssParameter> <CssParameter name="stroke-dasharray">5 7</CssParameter> </Stroke> @@ -194,7 +194,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#FF0000</CssParameter> + <CssParameter name="stroke">${mapLlStyleLogbookLineSettingColor}</CssParameter> <CssParameter name="stroke-width">4</CssParameter> </Stroke> </LineSymbolizer> @@ -211,7 +211,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#00FFFF</CssParameter> + <CssParameter name="stroke">${mapLlStyleLogbookLineHaulingColor}</CssParameter> <CssParameter name="stroke-width">4</CssParameter> </Stroke> </LineSymbolizer> @@ -240,7 +240,7 @@ <Mark> <WellKnownName>ttf://Serif#U+00B7</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -267,7 +267,7 @@ <Mark> <WellKnownName>Triangle</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -293,7 +293,7 @@ <Mark> <WellKnownName>Square</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -319,7 +319,7 @@ <Mark> <WellKnownName>Circle</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -345,7 +345,7 @@ <Mark> <WellKnownName>X</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -371,7 +371,7 @@ <Mark> <WellKnownName>Star</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -418,7 +418,7 @@ <Mark> <WellKnownName>ttf://Serif#U+0021</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -454,7 +454,7 @@ <Mark> <WellKnownName>ttf://Serif#U+00B7</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -481,7 +481,7 @@ <Mark> <WellKnownName>Triangle</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -508,7 +508,7 @@ <Mark> <WellKnownName>Square</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -535,7 +535,7 @@ <Mark> <WellKnownName>Circle</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -562,7 +562,7 @@ <Mark> <WellKnownName>X</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -589,7 +589,7 @@ <Mark> <WellKnownName>Star</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -637,7 +637,7 @@ <Mark> <WellKnownName>ttf://Serif#U+0021</WellKnownName> <Fill> - <CssParameter name="fill">#FF0000</CssParameter> + <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> ===================================== client/datasource/editor/ps/src/main/resources/map/ps-style.xml ===================================== @@ -17,10 +17,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<StyledLayerDescriptor version="1.0.0" - xmlns="http://www.opengis.net/sld" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<StyledLayerDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" + version="1.0.0" + xmlns="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd"> @@ -39,7 +39,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#00FF00</CssParameter> + <CssParameter name="stroke">${mapPsStyleObservationsColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> </Stroke> </LineSymbolizer> @@ -74,7 +74,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#00FF00</CssParameter> + <CssParameter name="stroke">${mapPsStyleObservationsColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> <CssParameter name="stroke-dasharray">6 4</CssParameter> </Stroke> @@ -129,7 +129,7 @@ <Mark> <WellKnownName>ttf://Serif#U+00B7</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -156,7 +156,7 @@ <Mark> <WellKnownName>ttf://Serif#U+25C6</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -183,7 +183,7 @@ <Mark> <WellKnownName>ttf://Serif#U+002B</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> @@ -210,7 +210,7 @@ <Mark> <WellKnownName>ttf://Serif#U+0021</WellKnownName> <Fill> - <CssParameter name="fill">#00FF00</CssParameter> + <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter> </Fill> <Stroke> <CssParameter name="stroke">#000000</CssParameter> ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -100,7 +100,16 @@ observe.config.map.layer7.description=File (shapefile) for layer 7 of map observe.config.map.layer8.description=File (shapefile) for layer 8 of map observe.config.map.layer9.description=File (shapefile) for layer 9 of map observe.config.map.ll.style.description=[Longline] File of styles used in map +observe.config.map.ll.style.logbook.line.hauling.color=[LL] Logbook Line hauling color +observe.config.map.ll.style.logbook.line.setting.color=[LL] Logbook Line setting color +observe.config.map.ll.style.logbook.line.trip.color=[LL] Logbook Line trip color +observe.config.map.ll.style.logbook.point.color=[LL] Logbook point color +observe.config.map.ll.style.observations.line.hauling.color=[LL] Observations Line hauling color +observe.config.map.ll.style.observations.line.setting.color=[LL] Observations Line setting color +observe.config.map.ll.style.observations.line.trip.color=[LL] Observations Line trip color +observe.config.map.ll.style.observations.point.color=[LL] Observations point color observe.config.map.ps.style.description=[Seine] File of styles used in map +observe.config.map.ps.style.observations.color=[Seine] Color for observations data observe.config.navigationIconsPath.description=Default navigation icons path. observe.config.observation.activitysDetaillees=Observation of detailled activities observe.config.observation.fauneAssociee=Observation of non target @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Change program observe.data.ll.common.Trip.action.move.choose.parent.message=Select target program observe.data.ll.common.Trip.action.move.choose.parent.title=Move trips to another program observe.data.ll.common.Trip.action.move.tip=Change program of trip(s) -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Total associated activities / fishing operation count +observe.data.ll.common.Trip.associatedActivityCount=Number of activities matched +observe.data.ll.common.Trip.associatedFishingOperationCount=Number of fishing operations matched observe.data.ll.common.Trip.availableData=Available data observe.data.ll.common.Trip.ersId=Id ERS observe.data.ll.common.Trip.generalComment=Comment @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=Common characteristics observe.data.ll.common.Trip.list.message.none=No trip for current program observe.data.ll.common.Trip.list.navigation.node=Trip observe.data.ll.common.Trip.list.title=List of trips -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Total logbook activities / fishing operation count +observe.data.ll.common.Trip.logbookActivityCount=Number of activities observe.data.ll.common.Trip.logbookAvailability=Logbook and associated data observe.data.ll.common.Trip.logbookComment=Comment +observe.data.ll.common.Trip.logbookFishingOperationCount=Number of fishing operations observe.data.ll.common.Trip.logbookTab=Logbook and associated data observe.data.ll.common.Trip.mapTab=Map observe.data.ll.common.Trip.message.not.open=Current trip is not opened, no edit possible. observe.data.ll.common.Trip.navigation.unsaved=New trip observe.data.ll.common.Trip.noOfCrewMembers=Number of crew observe.data.ll.common.Trip.noOfDays=Duration (days) -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Total observed activities / fishing operation count +observe.data.ll.common.Trip.observationsActivityCount=Number of activities observe.data.ll.common.Trip.observationsAvailability=Observations observe.data.ll.common.Trip.observationsComment=Comment +observe.data.ll.common.Trip.observationsFishingOperationCount=Number of fishing operations observe.data.ll.common.Trip.observationsTab=Observations observe.data.ll.common.Trip.species=Target species observe.data.ll.common.Trip.species.selected=Selected species ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -100,7 +100,16 @@ observe.config.map.layer7.description=Archivo (shapeFiles) del séptimo calco de observe.config.map.layer8.description=Archivo (shapeFiles) del octavo calco del mapa observe.config.map.layer9.description=Archivo (shapeFiles) del noveno calco del mapa observe.config.map.ll.style.description=[Longline] Archivo de los estilos a aplicar sobre los calcos del mapa \#TODO +observe.config.map.ll.style.logbook.line.hauling.color=[LL] Logbook Line hauling color +observe.config.map.ll.style.logbook.line.setting.color=[LL] Logbook Line setting color +observe.config.map.ll.style.logbook.line.trip.color=[LL] Logbook Line trip color +observe.config.map.ll.style.logbook.point.color=[LL] Logbook point color +observe.config.map.ll.style.observations.line.hauling.color=[LL] Observations Line hauling color +observe.config.map.ll.style.observations.line.setting.color=[LL] Observations Line setting color +observe.config.map.ll.style.observations.line.trip.color=[LL] Observations Line trip color +observe.config.map.ll.style.observations.point.color=[LL] Observations point color observe.config.map.ps.style.description=[Seina] Archivo de los estilos a aplicar sobre los calcos del mapa \#TODO +observe.config.map.ps.style.observations.color=[Seine] Color for observations data observe.config.navigationIconsPath.description=Default navigation icons path. \#TODO observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Reasignación del programa observe.data.ll.common.Trip.action.move.choose.parent.message=A qué programa quiere asociar las mareas seleccionadas ? observe.data.ll.common.Trip.action.move.choose.parent.title=Cambiar el programa de las mareas observe.data.ll.common.Trip.action.move.tip=Cambiar el programme de mareas seleccionadas -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Total associated activities / fishing operation count \#TODO +observe.data.ll.common.Trip.associatedActivityCount=Número de actividades coincidentes +observe.data.ll.common.Trip.associatedFishingOperationCount=Número de operaciones de pesca coincidentes observe.data.ll.common.Trip.availableData=Données disponibles observe.data.ll.common.Trip.ersId=Id ERS observe.data.ll.common.Trip.generalComment=Comentarios @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=General características observe.data.ll.common.Trip.list.message.none=Ninguna marea para el programa actual observe.data.ll.common.Trip.list.navigation.node=Marea observe.data.ll.common.Trip.list.title=List of trips -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Total logbook activities / fishing operation count \#TODO +observe.data.ll.common.Trip.logbookActivityCount=Número de actividades observe.data.ll.common.Trip.logbookAvailability=Diario de pesca y datos asociados observe.data.ll.common.Trip.logbookComment=Comentarios +observe.data.ll.common.Trip.logbookFishingOperationCount=Número de operaciones de pesca observe.data.ll.common.Trip.logbookTab=Diario de pesca y datos asociados observe.data.ll.common.Trip.mapTab=Mapa observe.data.ll.common.Trip.message.not.open=La marea actual no está abierta, no se puede modificar. observe.data.ll.common.Trip.navigation.unsaved=Nueva marea observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage observe.data.ll.common.Trip.noOfDays=Duración (días) -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Total observed activities / fishing operation count \#TODO +observe.data.ll.common.Trip.observationsActivityCount=Número de actividades observe.data.ll.common.Trip.observationsAvailability=Observaciones observe.data.ll.common.Trip.observationsComment=Comentarios +observe.data.ll.common.Trip.observationsFishingOperationCount=Número de operaciones de pesca observe.data.ll.common.Trip.observationsTab=Observaciones observe.data.ll.common.Trip.species=Especie objetivo observe.data.ll.common.Trip.species.selected=Espèces sélectionnées \#TODO ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -99,8 +99,17 @@ observe.config.map.layer6.description=Fichier (Shape Files) du sixième calque d observe.config.map.layer7.description=Fichier (Shape Files) du septième calque de la carte observe.config.map.layer8.description=Fichier (Shape Files) du huitième calque de la carte observe.config.map.layer9.description=Fichier (Shape Files) du neuvième calque de la carte -observe.config.map.ll.style.description=Fichier des style (Palangre) à appliquer sur les calques de la carte -observe.config.map.ps.style.description=Fichier des style (Senne) à appliquer sur les calques de la carte +observe.config.map.ll.style.description=[Palangre] Fichier des style à appliquer sur les calques de la carte +observe.config.map.ll.style.logbook.line.hauling.color=[Palangre] Livre de bord Ligne Couleur virage +observe.config.map.ll.style.logbook.line.setting.color=[Palangre] Livre de bord Ligne Couleur filage +observe.config.map.ll.style.logbook.line.trip.color=[Palangre] Livre de bord Ligne Couleur marée +observe.config.map.ll.style.logbook.point.color=[Palangre] Livre de bord Couleur points +observe.config.map.ll.style.observations.line.hauling.color=[Palangre] Observations Ligne Couleur virage +observe.config.map.ll.style.observations.line.setting.color=[Palangre] Observations Ligne Couleur filage +observe.config.map.ll.style.observations.line.trip.color=[Palangre] Observations Ligne Couleur marée +observe.config.map.ll.style.observations.point.color=[Palangre] Observations Couleur points +observe.config.map.ps.style.description=[Senne] Fichier des style à appliquer sur les calques de la carte +observe.config.map.ps.style.observations.color=[Senne] Couleur pour les données d'observation observe.config.navigationIconsPath.description=Chemin vers les icônes de navigation. observe.config.observation.activitysDetaillees=Observation des activités détaillées observe.config.observation.fauneAssociee=Observation des Faunes associées @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Réallocation du programme observe.data.ll.common.Trip.action.move.choose.parent.message=A quel programme voulez-vous associer les marées sélectionnées ? observe.data.ll.common.Trip.action.move.choose.parent.title=Changer le programme des marées observe.data.ll.common.Trip.action.move.tip=Changer le programme des marées sélectionnées -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche mises en correspondance +observe.data.ll.common.Trip.associatedActivityCount=Nombres d'activités associées +observe.data.ll.common.Trip.associatedFishingOperationCount=Nombre d'opérations de pêche associées observe.data.ll.common.Trip.availableData=Données disponibles observe.data.ll.common.Trip.ersId=Id ERS observe.data.ll.common.Trip.generalComment=Commentaire @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=Caractéristiques communes observe.data.ll.common.Trip.list.message.none=Aucune marée pour le programme courant observe.data.ll.common.Trip.list.navigation.node=Marée observe.data.ll.common.Trip.list.title=Liste de marées -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche livre de bord +observe.data.ll.common.Trip.logbookActivityCount=Nombres d'activités observe.data.ll.common.Trip.logbookAvailability=Livre de bord et données associées observe.data.ll.common.Trip.logbookComment=Commentaire +observe.data.ll.common.Trip.logbookFishingOperationCount=Nombre d'opérations de pêche observe.data.ll.common.Trip.logbookTab=Livre de bord et données associées observe.data.ll.common.Trip.mapTab=Carte observe.data.ll.common.Trip.message.not.open=La marée courante n'est pas ouverte, aucune modification possible. observe.data.ll.common.Trip.navigation.unsaved=Nouvelle marée observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage observe.data.ll.common.Trip.noOfDays=Durée (jours) -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche observées +observe.data.ll.common.Trip.observationsActivityCount=Nombres d'activités observe.data.ll.common.Trip.observationsAvailability=Données d'observation observe.data.ll.common.Trip.observationsComment=Commentaire +observe.data.ll.common.Trip.observationsFishingOperationCount=Nombre d'opérations de pêche observe.data.ll.common.Trip.observationsTab=Données d'observation observe.data.ll.common.Trip.species=Espèces ciblées observe.data.ll.common.Trip.species.selected=Espèces sélectionnées ===================================== models/dto/src/main/java/fr/ird/observe/dto/data/TripMapConfig.java ===================================== @@ -87,4 +87,23 @@ public interface TripMapConfig { List<File> getMapLayerFiles(); + Color getMapPsStyleObservationsColor(); + + File getTemporaryDirectory(); + + Color getMapLlStyleObservationsLineTripColor(); + + Color getMapLlStyleObservationsLineSettingColor(); + + Color getMapLlStyleObservationsLineHaulingColor(); + + Color getMapLlStyleObservationsPointColor(); + + Color getMapLlStyleLogbookLineTripColor(); + + Color getMapLlStyleLogbookLineSettingColor(); + + Color getMapLlStyleLogbookLineHaulingColor(); + + Color getMapLlStyleLogbookPointColor(); } ===================================== models/dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java ===================================== @@ -57,54 +57,6 @@ public class TripDto extends GeneratedTripDto { super.setStartDate(startDate == null ? null : DateUtil.getDay(startDate)); } - @Override - public void setObservationsActivityCount(int observationsActivityCount) { - super.setObservationsActivityCount(observationsActivityCount); - firePropertyChange("observationsActivityAndFishingOperationCount", getObservationsActivityAndFishingOperationCount()); - } - - @Override - public void setObservationsFishingOperationCount(int observationsFishingOperationCount) { - super.setObservationsFishingOperationCount(observationsFishingOperationCount); - firePropertyChange("observationsActivityAndFishingOperationCount", getObservationsActivityAndFishingOperationCount()); - } - - public String getObservationsActivityAndFishingOperationCount() { - return String.format("%d / %d", getObservationsActivityCount(), getObservationsFishingOperationCount()); - } - - @Override - public void setLogbookActivityCount(int logbookActivityCount) { - super.setLogbookActivityCount(logbookActivityCount); - firePropertyChange("logbookActivityAndFishingOperationCount", getLogbookActivityAndFishingOperationCount()); - } - - @Override - public void setLogbookFishingOperationCount(int logbookFishingOperationCount) { - super.setLogbookFishingOperationCount(logbookFishingOperationCount); - firePropertyChange("logbookActivityAndFishingOperationCount", getLogbookActivityAndFishingOperationCount()); - } - - public String getLogbookActivityAndFishingOperationCount() { - return String.format("%d / %d", getLogbookActivityCount(), getLogbookFishingOperationCount()); - } - - @Override - public void setAssociatedActivityCount(int associatedActivityCount) { - super.setAssociatedActivityCount(associatedActivityCount); - firePropertyChange("associatedActivityAndFishingOperationCount", getAssociatedActivityAndFishingOperationCount()); - } - - @Override - public void setAssociatedFishingOperationCount(int associatedFishingOperationCount) { - super.setAssociatedFishingOperationCount(associatedFishingOperationCount); - firePropertyChange("associatedActivityAndFishingOperationCount", getAssociatedActivityAndFishingOperationCount()); - } - - public String getAssociatedActivityAndFishingOperationCount() { - return String.format("%d / %d", getAssociatedActivityCount(), getAssociatedFishingOperationCount()); - } - public void updateNoOfDays() { setNoOfDays(createNoOfDay(startDate, endDate)); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f88769466370fb9ac864ae787... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f88769466370fb9ac864ae787... You're receiving this email because of your account on gitlab.com.