Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

29 changed files:

Changes:

  • client/configuration/src/main/config/Client.ini
    ... ... @@ -532,7 +532,7 @@ defaultValue = ${resources.directory}/map/shapeFiles/borders/WDBII_border_l_L1.s
    532 532
     description = observe.config.map.layer5.description
    
    533 533
     key = map.layer5.path
    
    534 534
     type = file
    
    535
    -defaultValue = ${resources.directory}/map/shapeFiles/zee/World_EEZ_v8_2014.shp
    
    535
    +defaultValue = ${resources.directory}/map/shapeFiles/zee/eez_v11_lowres.shp
    
    536 536
     
    
    537 537
     [option mapLayer6]
    
    538 538
     description = observe.config.map.layer6.description
    
    ... ... @@ -565,12 +565,66 @@ key = map.ps.style.path
    565 565
     type = file
    
    566 566
     defaultValue = ${resources.directory}/map/ps-style.xml
    
    567 567
     
    
    568
    +[option mapPsStyleObservationsColor]
    
    569
    +description = observe.config.map.ps.style.observations.color
    
    570
    +key = map.ps.style.observations.color
    
    571
    +type = color
    
    572
    +defaultValue = java.awt.Color[r=0,g=255,b=0]
    
    573
    +
    
    568 574
     [option mapLlStyleFile]
    
    569 575
     description = observe.config.map.ll.style.description
    
    570 576
     key = map.ll.style.path
    
    571 577
     type = file
    
    572 578
     defaultValue = ${resources.directory}/map/ll-style.xml
    
    573 579
     
    
    580
    +[option mapLlStyleObservationsLineTripColor]
    
    581
    +description = observe.config.map.ll.style.observations.line.trip.color
    
    582
    +key = map.ll.style.observations.line.trip.color
    
    583
    +type = color
    
    584
    +defaultValue = java.awt.Color[r=0,g=255,b=0]
    
    585
    +
    
    586
    +[option mapLlStyleObservationsLineSettingColor]
    
    587
    +description = observe.config.map.ll.style.observations.line.setting.color
    
    588
    +key = map.ll.style.observations.line.setting.color
    
    589
    +type = color
    
    590
    +defaultValue = java.awt.Color[r=0,g=255,b=0]
    
    591
    +
    
    592
    +[option mapLlStyleObservationsLineHaulingColor]
    
    593
    +description = observe.config.map.ll.style.observations.line.hauling.color
    
    594
    +key = map.ll.style.observations.line.hauling.color
    
    595
    +type = color
    
    596
    +defaultValue = java.awt.Color[r=255,g=255,b=0]
    
    597
    +
    
    598
    +[option mapLlStyleObservationsPointColor]
    
    599
    +description = observe.config.map.ll.style.observations.point.color
    
    600
    +key = map.ll.style.observations.point.color
    
    601
    +type = color
    
    602
    +defaultValue = java.awt.Color[r=0,g=255,b=0]
    
    603
    +
    
    604
    +[option mapLlStyleLogbookLineTripColor]
    
    605
    +description = observe.config.map.ll.style.logbook.line.trip.color
    
    606
    +key = map.ll.style.logbook.line.trip.color
    
    607
    +type = color
    
    608
    +defaultValue = java.awt.Color[r=34,g=34,b=34]
    
    609
    +
    
    610
    +[option mapLlStyleLogbookLineSettingColor]
    
    611
    +description = observe.config.map.ll.style.logbook.line.setting.color
    
    612
    +key = map.ll.style.logbook.line.setting.color
    
    613
    +type = color
    
    614
    +defaultValue = java.awt.Color[r=255,g=0,b=0]
    
    615
    +
    
    616
    +[option mapLlStyleLogbookLineHaulingColor]
    
    617
    +description = observe.config.map.ll.style.logbook.line.hauling.color
    
    618
    +key = map.ll.style.logbook.line.hauling.color
    
    619
    +type = color
    
    620
    +defaultValue = java.awt.Color[r=0,g=255,b=255]
    
    621
    +
    
    622
    +[option mapLlStyleLogbookPointColor]
    
    623
    +description = observe.config.map.ll.style.logbook.point.color
    
    624
    +key = map.ll.style.logbook.point.color
    
    625
    +type = color
    
    626
    +defaultValue = java.awt.Color[r=255,g=0,b=0]
    
    627
    +
    
    574 628
     [option validationSpeedEnable]
    
    575 629
     description = observe.config.validation.speedEnable
    
    576 630
     key = validation.speedEnable
    
    ... ... @@ -758,25 +812,25 @@ defaultValue = {\"fr.ird.referential.common.Species#1239832684290#0.046805073247
    758 812
     [option temporaryFilesTimeout]
    
    759 813
     description = observe.config.client.temporaryFiles.timeout.description
    
    760 814
     key = observe.config.client.temporaryFilesTimeout
    
    761
    -type = int
    
    815
    +type = Integer
    
    762 816
     defaultValue = 120
    
    763 817
     
    
    764 818
     [option logFilesTimeout]
    
    765 819
     description = observe.config.client.logFiles.timeout.description
    
    766 820
     key = observe.config.client.logFilesTimeout
    
    767
    -type = int
    
    821
    +type = Integer
    
    768 822
     defaultValue = 720
    
    769 823
     
    
    770 824
     [option feedbackFilesTimeout]
    
    771 825
     description = observe.config.client.feedbackFiles.timeout.description
    
    772 826
     key = observe.config.client.feedbackFilesTimeout
    
    773
    -type = int
    
    827
    +type = Integer
    
    774 828
     defaultValue = 720
    
    775 829
     
    
    776 830
     [option backupFilesTimeout]
    
    777 831
     description = observe.config.client.backupFiles.timeout.description
    
    778 832
     key = observe.config.client.backupFilesTimeout
    
    779
    -type = int
    
    833
    +type = Integer
    
    780 834
     defaultValue = 2160
    
    781 835
     
    
    782 836
     [action help]
    

  • client/configuration/src/main/i18n/getters/config.getter
    ... ... @@ -53,7 +53,16 @@ observe.config.map.layer7.description
    53 53
     observe.config.map.layer8.description
    
    54 54
     observe.config.map.layer9.description
    
    55 55
     observe.config.map.ll.style.description
    
    56
    +observe.config.map.ll.style.logbook.line.hauling.color
    
    57
    +observe.config.map.ll.style.logbook.line.setting.color
    
    58
    +observe.config.map.ll.style.logbook.line.trip.color
    
    59
    +observe.config.map.ll.style.logbook.point.color
    
    60
    +observe.config.map.ll.style.observations.line.hauling.color
    
    61
    +observe.config.map.ll.style.observations.line.setting.color
    
    62
    +observe.config.map.ll.style.observations.line.trip.color
    
    63
    +observe.config.map.ll.style.observations.point.color
    
    56 64
     observe.config.map.ps.style.description
    
    65
    +observe.config.map.ps.style.observations.color
    
    57 66
     observe.config.navigationIconsPath.description
    
    58 67
     observe.config.observation.activitysDetaillees
    
    59 68
     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;
    72 72
     
    
    73 73
     import javax.swing.UIDefaults;
    
    74 74
     import javax.swing.UIManager;
    
    75
    +import java.awt.Color;
    
    75 76
     import java.beans.PropertyChangeListener;
    
    76 77
     import java.io.File;
    
    77 78
     import java.io.IOException;
    
    ... ... @@ -247,6 +248,10 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    247 248
             UIManager.getDefaults().put("DecoratorService", (UIDefaults.LazyValue) table -> new DecoratorService(referentialLocale));
    
    248 249
         }
    
    249 250
     
    
    251
    +    public static String getColorToHex(Color color) {
    
    252
    +        return String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue());
    
    253
    +    }
    
    254
    +
    
    250 255
         public ClientConfig() {
    
    251 256
             this(DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME);
    
    252 257
         }
    

  • client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java
    ... ... @@ -303,7 +303,16 @@ public class ClientConfigUI extends JXTitledPanel {
    303 303
             helper.addOption(ClientConfigOption.MAP_BACKGROUND_COLOR);
    
    304 304
             ClientConfig.MAP_LAYERS.forEach(helper::addOption);
    
    305 305
             helper.addOption(ClientConfigOption.MAP_PS_STYLE_FILE);
    
    306
    +        helper.addOption(ClientConfigOption.MAP_PS_STYLE_OBSERVATIONS_COLOR);
    
    306 307
             helper.addOption(ClientConfigOption.MAP_LL_STYLE_FILE);
    
    308
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_TRIP_COLOR);
    
    309
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_SETTING_COLOR);
    
    310
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_HAULING_COLOR);
    
    311
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_POINT_COLOR);
    
    312
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_TRIP_COLOR);
    
    313
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_SETTING_COLOR);
    
    314
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_LINE_HAULING_COLOR);
    
    315
    +        helper.addOption(ClientConfigOption.MAP_LL_STYLE_LOGBOOK_POINT_COLOR);
    
    307 316
     
    
    308 317
         }
    
    309 318
     
    

  • 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;
    22 22
      * #L%
    
    23 23
      */
    
    24 24
     
    
    25
    +import fr.ird.observe.client.configuration.ClientConfig;
    
    25 26
     import fr.ird.observe.dto.I18nEnumHelper;
    
    26 27
     import fr.ird.observe.dto.data.TripMapConfig;
    
    27 28
     import fr.ird.observe.dto.data.TripMapConfigDto;
    
    ... ... @@ -30,6 +31,8 @@ import fr.ird.observe.dto.data.TripMapDto;
    30 31
     import fr.ird.observe.dto.data.TripMapPoint;
    
    31 32
     import fr.ird.observe.dto.data.TripMapPointType;
    
    32 33
     import org.apache.commons.lang3.StringUtils;
    
    34
    +import org.apache.logging.log4j.LogManager;
    
    35
    +import org.apache.logging.log4j.Logger;
    
    33 36
     import org.geotools.data.FileDataStore;
    
    34 37
     import org.geotools.data.FileDataStoreFinder;
    
    35 38
     import org.geotools.data.simple.SimpleFeatureSource;
    
    ... ... @@ -59,12 +62,16 @@ import org.opengis.referencing.FactoryException;
    59 62
     import java.io.File;
    
    60 63
     import java.io.FileNotFoundException;
    
    61 64
     import java.io.IOException;
    
    65
    +import java.nio.charset.StandardCharsets;
    
    66
    +import java.nio.file.Files;
    
    62 67
     import java.nio.file.Path;
    
    63 68
     import java.text.SimpleDateFormat;
    
    64 69
     import java.util.ArrayList;
    
    65 70
     import java.util.HashSet;
    
    71
    +import java.util.LinkedHashMap;
    
    66 72
     import java.util.LinkedList;
    
    67 73
     import java.util.List;
    
    74
    +import java.util.Map;
    
    68 75
     import java.util.Optional;
    
    69 76
     import java.util.Set;
    
    70 77
     
    
    ... ... @@ -84,18 +91,39 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil
    84 91
         protected static final String LOGBOOK_POINTS_LAYER_NAME = "Logbook points";
    
    85 92
     
    
    86 93
         protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd");
    
    87
    -
    
    94
    +    private static final Logger log = LogManager.getLogger(TripMapContentBuilderSupport.class);
    
    88 95
         protected final List<ObserveMapPaneLegendItem> legendItems;
    
    89 96
         protected final List<TripMapPoint> notValidPoints = new LinkedList<>();
    
    90 97
         protected final Set<TripMapPointType> acceptedTripPointTypes;
    
    91 98
         protected MapContent mapContent;
    
    92 99
         protected StyledLayerDescriptor styledLayerDescriptor;
    
    93 100
     
    
    101
    +
    
    94 102
         public static TripMapContentBuilderSupport of(TripMapConfig config, TripMapConfigDto tripMapConfig, TripMapDto tripMapDto, List<TripMapPoint> tripMapPoints) throws Exception {
    
    95 103
             TripMapContentBuilderSupport builder = (TripMapContentBuilderSupport) config.getTripMapContentBuilders().stream().filter(t -> t.accept(tripMapDto)).findFirst().orElseThrow(IllegalStateException::new);
    
    96 104
             builder.reset();
    
    97 105
             File styleFile = builder.getStyleFile(config.getMapDirectory().toPath());
    
    98
    -        builder.setStyledLayerDescriptor(styleFile);
    
    106
    +        String content = Files.readString(styleFile.toPath());
    
    107
    +
    
    108
    +        Map<String, String> replaceMapping = new LinkedHashMap<>();
    
    109
    +        replaceMapping.put("mapPsStyleObservationsColor", ClientConfig.getColorToHex(config.getMapPsStyleObservationsColor()));
    
    110
    +        replaceMapping.put("mapLlStyleObservationsLineTripColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineTripColor()));
    
    111
    +        replaceMapping.put("mapLlStyleObservationsLineSettingColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineSettingColor()));
    
    112
    +        replaceMapping.put("mapLlStyleObservationsLineHaulingColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsLineHaulingColor()));
    
    113
    +        replaceMapping.put("mapLlStyleObservationsPointColor", ClientConfig.getColorToHex(config.getMapLlStyleObservationsPointColor()));
    
    114
    +        replaceMapping.put("mapLlStyleLogbookLineTripColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineTripColor()));
    
    115
    +        replaceMapping.put("mapLlStyleLogbookLineSettingColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineSettingColor()));
    
    116
    +        replaceMapping.put("mapLlStyleLogbookLineHaulingColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookLineHaulingColor()));
    
    117
    +        replaceMapping.put("mapLlStyleLogbookPointColor", ClientConfig.getColorToHex(config.getMapLlStyleLogbookPointColor()));
    
    118
    +
    
    119
    +        for (Map.Entry<String, String> entry : replaceMapping.entrySet()) {
    
    120
    +            content = content.replaceAll("\\$\\{" + entry.getKey() + "}", entry.getValue());
    
    121
    +        }
    
    122
    +
    
    123
    +        Path newPath = config.getTemporaryDirectory().toPath().resolve("map-temp" + System.nanoTime());
    
    124
    +
    
    125
    +        Files.write(newPath, content.getBytes(StandardCharsets.UTF_8));
    
    126
    +        builder.setStyledLayerDescriptor(newPath.toFile());
    
    99 127
             for (File layerFile : config.getMapLayerFiles()) {
    
    100 128
                 builder.addLayer(layerFile);
    
    101 129
             }
    

  • client/datasource/editor/common/src/main/map/shapeFiles/zee/LICENSE_EEZ_v11.txt
    1
    +LICENSE, TERMS OF USE & CITATION
    
    2
    +LICENSE
    
    3
    +Marine Regions’ data is licensed under CC-By (https://creativecommons.org/licenses/by/4.0/).
    
    4
    +Please contact us for other uses of the Licensed Material beyond license terms.
    
    5
    +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.
    
    6
    +
    
    7
    +
    
    8
    +TERMS OF USE
    
    9
    +Marine Regions is not meant to be used for legal, economical (in the sense of exploration of natural resources) or navigational purposes.
    
    10
    +It is developed solely for scientific, educational and research purposes.
    
    11
    +
    
    12
    +VLIZ can in no case be held accountable or liable for faults, of any nature, that might occur in the usage of Marine Regions.
    
    13
    +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.
    
    14
    +VLIZ expresses no opinion about the legal state neither of any country, territory or area nor concerning its delimitation, frontier or borders.
    
    15
    +The data has no legal value whatsoever.
    
    16
    +
    
    17
    +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/).
    
    18
    +The provisions above in no way replace the provisions of the CC-license.
    
    19
    +If any of the abovementioned provisions divert from or contradict the provisions of the CC-license in any way, the CC-license provisions prevail.
    
    20
    +
    
    21
    +
    
    22
    +FEEDBACK
    
    23
    +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).
    
    24
    +
    
    25
    +Feedback of the users of Marine Regions is more than welcome.
    
    26
    +In case you notice mistakes, incompleteness or are willing to join us in this endeavor, please contact us on info@marineregions.org.
    
    27
    +
    
    28
    +
    
    29
    +CITATION
    
    30
    +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
    
    31
    +
    
    32
    +
    
    33
    +

  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf deleted
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn deleted
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx deleted
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp deleted
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml deleted
    1
    -<!--
    
    2
    -  #%L
    
    3
    -  ObServe Client :: DataSource :: Editor :: Common
    
    4
    -  %%
    
    5
    -  Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
    
    6
    -  %%
    
    7
    -  This program is free software: you can redistribute it and/or modify
    
    8
    -  it under the terms of the GNU General Public License as
    
    9
    -  published by the Free Software Foundation, either version 3 of the
    
    10
    -  License, or (at your option) any later version.
    
    11
    -  This program is distributed in the hope that it will be useful,
    
    12
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    13
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    14
    -  GNU General Public License for more details.
    
    15
    -  You should have received a copy of the GNU General Public
    
    16
    -  License along with this program.  If not, see
    
    17
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    18
    -  #L%
    
    19
    -  -->
    
    20
    -<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">&lt;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'&gt;&lt;WKT&gt;GEOGCS[&amp;quot;GCS_WGS_1984&amp;quot;,DATUM[&amp;quot;D_WGS_1984&amp;quot;,SPHEROID[&amp;quot;WGS_1984&amp;quot;,6378137.0,298.257223563]],PRIMEM[&amp;quot;Greenwich&amp;quot;,0.0],UNIT[&amp;quot;Degree&amp;quot;,0.0174532925199433],AUTHORITY[&amp;quot;EPSG&amp;quot;,4326]]&lt;/WKT&gt;&lt;XOrigin&gt;-400&lt;/XOrigin&gt;&lt;YOrigin&gt;-400&lt;/YOrigin&gt;&lt;XYScale&gt;11258999068426.238&lt;/XYScale&gt;&lt;ZOrigin&gt;-100000&lt;/ZOrigin&gt;&lt;ZScale&gt;10000&lt;/ZScale&gt;&lt;MOrigin&gt;-100000&lt;/MOrigin&gt;&lt;MScale&gt;10000&lt;/MScale&gt;&lt;XYTolerance&gt;8.983152841195215e-009&lt;/XYTolerance&gt;&lt;ZTolerance&gt;0.001&lt;/ZTolerance&gt;&lt;MTolerance&gt;0.001&lt;/MTolerance&gt;&lt;HighPrecision&gt;true&lt;/HighPrecision&gt;&lt;LeftLongitude&gt;-180&lt;/LeftLongitude&gt;&lt;WKID&gt;4326&lt;/WKID&gt;&lt;LatestWKID&gt;4326&lt;/LatestWKID&gt;&lt;/GeographicCoordinateSystem&gt;</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. 
    
    21
    -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>&lt;DIV STYLE="text-align:Left;"&gt;&lt;DIV&gt;&lt;DIV&gt;&lt;P STYLE="margin:0 0 0 0;"&gt;&lt;SPAN&gt;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).&lt;/SPAN&gt;&lt;/P&gt;&lt;/DIV&gt;&lt;/DIV&gt;&lt;/DIV&gt;</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>&lt;DIV STYLE="text-align:Left;"&gt;&lt;DIV&gt;&lt;DIV&gt;&lt;DIV STYLE="font-size:12pt"&gt;&lt;P&gt;&lt;SPAN STYLE="font-size:10pt"&gt;Disclaimer: &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN STYLE="font-size:10pt"&gt;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.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN STYLE="font-size:10pt"&gt;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.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN STYLE="font-size:10pt"&gt;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&lt;/SPAN&gt;&lt;/P&gt;&lt;/DIV&gt;&lt;/DIV&gt;&lt;/DIV&gt;&lt;/DIV&gt;</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
    
    22
    -HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy
    
    23
    -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACFAMgDASIA
    
    24
    -AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA
    
    25
    -AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3
    
    26
    -ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm
    
    27
    -p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA
    
    28
    -AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx
    
    29
    -BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK
    
    30
    -U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3
    
    31
    -uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii
    
    32
    -gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooqoNQQ7j5
    
    33
    -Uu1ZDGWAHUHHTOamU4x+J2At0VSOpRKxVkYFeoLoCPr81NbVoOEU4kYhVUsrcn2BJ9T+Bqfaw3uO
    
    34
    -zL9FYl9qiwR/JcCeVjhYlkCDOM9QCR+uawY9a1K4gkkGmxFQCA5V32H1LEdODwcfXPFZrEcyvCLY
    
    35
    -WOz+1W//AD3i/wC+xR9rtv8An4i/77FedXGteIbm6aJZUVedpj/dowJ4O48jgHqe2fejSr3VJZFF
    
    36
    -xqUwJQsj5aRGGcdFxtPU/MeeOO9Uqk7XaX9fILHopu7YdbiIf8DFH2u2/wCfiL/vsVy2nQyzQPLe
    
    37
    -XEt8r5KrFdHa645wBwT143dq2rWHTNUtxcW080sRJB23Mo57gjd+hojUc/hsFi/9rtv+fiL/AL7F
    
    38
    -H2u2/wCfiL/vsVl6rZ6RZ2pursTRImFBimkU5J44U8mqGhGdYJbu7muPJklP2VJZt+U7H1zxnn9K
    
    39
    -mtVlSjd2BK50qTwyNtSVGPorA1JWNLJJI7C4hIhP3V8wc47/AOT6Vm36XO4yw3cFtbEEgyWqqQ3U
    
    40
    -A7yMjH41nHFuyut/MfKdXRXLwXELxokbxXU4bJ8pY2HI6sFOcdOnt1q1cxRrbtdTF7dFH+rijRsj
    
    41
    -oDgpkdc+3fHNJ4y32Q5Teork9NYFROEEsTkfLPMjSAHHRUQ889CasHU7JpF+zWk0+W2lVgCjOOxb
    
    42
    -Aznjr1zTWJk3ZQuHKdJRXPT6ZqjzCW2MEaNgmKXYwX2wEz9fm69PeWIXkUywzWCyfMQbi3XywOM9
    
    43
    -Cc9vXHvWrqVEr8grI3KKyzfPDIsJMoBHDyQMfwyMc/Xr71U/tS+8yVfsd5tUZWQKCG/JKft12f3B
    
    44
    -Y36KzftSgLuvtrN0UsmT+lNh1ZQjGVTwcD54y344b+VTHEwk7beoWZqUUUV0CCudbT2ubuaQXDx7
    
    45
    -JmYpHIQr/MSNxH4cdsd+/RVRbS4GkZ2ZiWYscqp6nPXGf/1VhXpynG0Rp2MXS759MtJbSO2lu5lO
    
    46
    -5fJfdCM4G0MfujqenY1pNqbG3LXFpHIpyQsUm4Pj0LBVJ9s1fFlbgAGPeB08wl8fnmpZI1ljKOMq
    
    47
    -ffFUo1LasNCnpl1p+o2SS2IjMS5XaFAKHHKkdjzSy6PpkzbpLC2Zt27JiHJxjn149azzYLBrkMsc
    
    48
    -zRPkByuAJVIc/OOh5HBwDya3aqEuZaiMW+0e0UKLezihRwVleG3UnaOQMAfrg9OlZEehL58NjDeb
    
    49
    -ot5kBMQLJgcAt19PTt04FdjVSc2VlN9tlCRyyYi3gZZ/RQByTx+lTKneSlfQdznorWezu7m51ACK
    
    50
    -S5P7v59sQkBPUgnluMEjI5HHe3ax3NrHcpZxmIXMpkfeCXhdsbsYBDeoyR+IqjJb6lqTzF7mUQMm
    
    51
    -0qCzEnGcYQBVzkAjJI55710Om201vGBM5YhAuTgE4zyQOBxx1rFRvV5oN6j6EJ00T/O6B+uFmYls
    
    52
    -f72Tgd8VQNh/ZZVmkJBRtzSSFxtHUkbcZ5HYe+a2pLxY5SnluQpwWG0AHGccn05qnrBjm00sNxDq
    
    53
    -6ZC5wNpJyp4/h74pVKdNxdnqvME2Ytvqu+ylubVEDRfKFl+UNJg5Prjg8fyxk0jrdvcRJcaar3Go
    
    54
    -zuUd5IwJUUEAKo5C5yMH8+avx6fY6PNJNe27SZYvFEXDhCcF2A4AHyr71atfFdu0sSXFs1tBLHvj
    
    55
    -k3BgMdQ2OnbHXqOh4q6cIxd76/ihNmgbKTULGNLvzYGUDaVlDOeP4vl25/A0+DRdPg5+zrIxABaY
    
    56
    -mQnjH8Wew7VRm1m+ufMfSrQTW68CV0bDHuQOCcHjA7g9Kl1HWZrKKyl8gok7AOJFyydONoPXr61v
    
    57
    -dbiNI2dsYjGIIwhO7CqB83rx39+tFtZW1mpFvCkefvEDluSeT1PJJ59anoqgCiikZlRGd2CqoyWJ
    
    58
    -wAKAFqgNWtnErQt5qRbgzqy7QR179qZLrthHGWSbzWDbSkf3gfxxjoaxJpL2fWJZY7aMo0YhkVge
    
    59
    -FYnAIHJPUnjvWNapyq0XqNI1bvUrxQhgs4y29VxIw+UnvweTg9B2yc9qSa4mlZFilhgy25/LAkVs
    
    60
    -/wB5iAB/M1PBYM8vnzDyyQAFU849P9kewP1PapjpsPzhWdQ/3gMHPOepGepPfvWa9vJJ7D0LlFFF
    
    61
    -dRIVQF5KJmRmh3byBG2UOM8Edc/lV+qt7a/a4whCsvOUfOD78en+fWs6qk17j1GhVvY9wWRXiY44
    
    62
    -Ycc8DkZA/GrNZSWlnc7Y45mLBPmyPvKRgkZ6ZyenHNatFNya963yBlPULbzot6j50578jOfUcjGR
    
    63
    -3yKpWOo3Ed99ivBvRkVoLlRxIOBhj0zkj65HrWzWTcQMpWzLKYzjHy4Jyf1x1JGD34qKnNGSlH5g
    
    64
    -ie5vZ452iht9wXGZDkjPXoBnpWHNrcVzqcVs80YaMbwVYLt4IJwc4bnGG4/MGruo2d2IJGK+dlNu
    
    65
    -Vk2k+npkgnIzu/HNc42nw6hefYZ7Vw0SYjjEZ3Egc85AxjjrjjjrWc3Ntp7dv63Gjs7RMyAxy/u1
    
    66
    -zhdzZxyApU9Mf0q9XCGz1PTJbS8eGVNzN5vzB1j5+TBJzk9CSQMcc8Cu3hnjnUtG2QDg8EEfnW1N
    
    67
    -9HoxMSS3jlJJXDHjcOD/APX/ABrCe2kmuhbRxhyJHZpCSNi5I5PJPDdOhI7c1uXUbSRYXnByV/vD
    
    68
    -/PP4Vj2DtZaxPDPF5ayqoSTcMFvQj3yfbORUVIKU0mvn+gIv2+iaba8xWUO7aE3MuTj05qq3huzW
    
    69
    -SUwARLM2ZFC5B9QO3cjkHGeK12dFZVZlBboCetOrZxUlZiOYuNLh0a5tL2SR3tklAkPQqW4Vmx1G
    
    70
    -Tz+HpWtqs8luLd/sBvIC+JQi73T0YL396u3EEdzbyQSjKSKVYe1YYm1fT7VLV4xIFYot1uGWXkg7
    
    71
    -e2Bwep44BpO0F5AX4dcsZVJZ3hZcB1mjZdhJwAxIwDnjrWiCCAQcg1lfYkWweSZd0o3MrMMlevOO
    
    72
    -vIJJHfOPaqzXaoI7CFyqjd8yDgLkY5z0AJ4HPy+lR7WztIdjcSSOUExurgHBKnOD6Uya5gtkLzTJ
    
    73
    -GvqzY7ZrnJLz+w5WMaAxmQqUJ27ssQCcA45P6Y7VDM9o11c6iG2RvEHJlbupyRgHoccE++MjFS8Q
    
    74
    -lG/ULEFnYrquHheWGJZSSceUxxyAR1J2lefXJ54rcsEtrZbYrhQzEfO5JJ5Gck9ev4se9ZWkXgae
    
    75
    -6tLq33OjmPC4JcNuYY9CMkHsMjnitTZLIkssMYb7RGAGLjOcHluPp0z3rklLlak312/r7yjTgukn
    
    76
    -UsAyAKGy2Oh79fai4klFvvtlWRsjHcEZ5/Sqk8g2GIRpbhjuMhGVLZyPT9f1qa0zDM0JLMrDepbH
    
    77
    -UcHp9R+tdUMRFyUL38ybdS5RRRXSIKworyRJ7pyXVopJFIKswcZypJ6AY4//AFYrdrmZLbzb4yLl
    
    78
    -mW5kUjbnIOc5wM4HHU9cVzYltJco0W1DRzP5ZyisXQbDyQeFGRwcAjqePyrSa+hUj7xGMlsYx19e
    
    79
    -ex/Ks9lLTW3mzss4G0puxhsE7sDr39RzVkW8IjMZVVaRcMQeW49TyetcaxMqbatuXy3NCiqsV5uU
    
    80
    -eZG4+bZv4wTnAPXPP9amknjjO1nG7rtHJ/LrXpRqRkrpmdivfQSTNEUUMq5yCMnOQcjkY6HntVLS
    
    81
    -oGS9lErAlBx6ltzbieB229z973FbAIYAggg8gjvWZfZW5We2dfPXCYbOCegGe/XkewPaonCKl7Qf
    
    82
    -kaZAYEEAg8EGssafeQ3cslvJAkTOCqKpQgYwfUHkDt3PStGCTzYI5CMF1DY9Mimz3MduPmyzHoiD
    
    83
    -LH8P69K0lZq7EUR589yqSOVlVgPlyAgGCT1wc5Uc469OoqzdiCZhDMhJ4wwA+XJwPz/H3qras9up
    
    84
    -dUDeZghhk+Z64/HJz75rRlhWQFgqCUAhHKglTWVNXi/1/rsNmTe6FDJAPKUvIp4yFyflIx2/z71a
    
    85
    -0Z86ckP70mA+UWk6tjv+RFWbaOWNW8w9TkDeWx+JqvpmQsqSHMwI3HH4fzDfz71UdJJpWuBeY7VJ
    
    86
    -wTgZwKw7eaW9lNxLjcrfKhUlYwMHk9Dzj3yM9sDUvbo2tvvABY8AH6Z/GuWtrJECOZf3ivtZVYqu
    
    87
    -w4GOOR97rxwDWdeTWkXqCOkkuDLp05yjNzHuU/Lk8A/qKbaW6STTSSRgOrhRtckYwD7dyajsJGcK
    
    88
    -PLkIkGJQ6kjIGOD0Pp1NaSIsahUUKo6BRgUU17S05dED0MHXtOhlmin3pHJvDbi+wjoDz6Hj6EDs
    
    89
    -TWdA8QtxFclCdptw0pKgEFv3mdu3ODng4HY811M9nHPJvdmx8uVGMNg5GeKpXUMcUiwRCTzZODIG
    
    90
    -O/GOADkdlJyfTuTSqQknzIaOUtru4jjWeK9sjOvyiHzQSRztA254wSMkjrnsK1kuI4Yg08gR+pii
    
    91
    -lKsrE8nHccjkk9e3bTh0OEztPKipuP8Aq0UDI5+83UnnPXHb6sOiiBpJgfN7bNuCy5JOT3bn9Mdz
    
    92
    -WfsZct7BcprfNdItvvbzigHlbgCR3+bOGOM9BxzxmrcMhQlzG5nUbyxxnHIwc84x/Q96Yy24AKyg
    
    93
    -KVBj4VSzZIwOmD2PfntVaJJVj2zMfO8tQizEM/U5wRznGPz54xXLB6qyKOnooor2DMKzNO2G7uji
    
    94
    -JJFkddqkbmG7OT+Y+nPrWnVG3tnNwZZQyBJGKLnOcluevTB6fnWc0+aNkMusqupV1DKeoIyKrixh
    
    95
    -yMjKKcrGQNoP5e5qzRVuKe6EQrawKRtTAHRcnA+g6USWyyS+ZvZTjB245/SpqKThFqzQCIqoioow
    
    96
    -qjAHtWRdRFJnkkMgYFpI0DDYSDgYHXPI/GtisPxBHNLbyJEryEiM+WuMsgfMgX3xj9KyxEU4ajW5
    
    97
    -fmuBY2ywRbZJ0jBSPkbgMA9M4+pqCziku5XurlRtY4VOGBA6Y46DJ+pOemKzo70Xk73It2UtKI3E
    
    98
    -0ZGxRnarZIx/ex6vj67LX3lrGJAiu+cb32AgHt/PFT7WMm77ILFyoJrho5BGiKzFd3zNtz9OD/ki
    
    99
    -mJdswO6B+DjK/wD18GpiIrmMEjcucg9CD0+oPWtOdVIv2ctQtbcdG6yIHXOD61Rmjlt74zwqzK4+
    
    100
    -Zecd+OB64PTu3rU7zrAfKSMYRQSMgAD2/L6e9To4kjV16MARmndT92+qAoiCa7uRJcxhEX7q5z/n
    
    101
    -PfOOmMdTVqO1hjYFExj7oycL9B0H4UXETyKAuCB1UnAP+fSoGtJWC7mWTAxhyTt5J4POeoH4VLTi
    
    102
    -9I3+4C7VZLrfME2YUsyA7ucjOePwNQ3pngtl2szBVwzD14wTzkD8frS2MxkkkDKjMB/rVIJPsxAA
    
    103
    -z/Sm53mo7BYvVn38UguIZ4o9xXHqcEH2BP3S46d60KKuUeZWEZ73N6wLJCFQDJyjMfwBwT9Mfjni
    
    104
    -mRauiQk3iiOTeUAjy6n05xwfY4rTqrc2EV1IHcsCMHgA8jODyDzyahxmtYu/qMorZveQuHjhUFmD
    
    105
    -S5yRkksACOmSR19aotcJHKbZGUGbdJtRQAwU4BGOQDgEHkHB6VozyokAjWItbRyESMx+9jOTjv8A
    
    106
    -N+fPBqGG32vKkSNOXj5m3AnPQgngY6cD/CuRtRkow1fX9Sjbooor0CApsciSglDnDFT7EdadWcLf
    
    107
    -DSFrPcWdjuwnOScd/TFZVajgrpXGlcvs6ou52Cj1JxUf2u37TIx9FbJ/IVjXVtdq4mtCyMrZEYg2
    
    108
    -8dwTtOfwx9an06AINlxHcyuzZzLuKjj/AGiR+lTCpOf2bev/AAwNI0ftcX/TT/v03+FBu4wDgSE+
    
    109
    -mwj9TgVDLpGmTEGXTrSQjpvgU/0p402yUYS1iQYwQihQR6EDqPrVtVOjX3f8ENCBdWil3eS0DbTg
    
    110
    -gzrkflmotR1W3s7bfetBFH1yxL/iABz9fersOn2dvEsUNrCka9FCDAqhd6G1xeLNHdiJF5EYhXGf
    
    111
    -qMH881DhU/m/ALox1la/v4fsoSKGRmC3MyiVpWA5AB6YH5/StyKzVyYgsarGBklcmTjqRwPX1pkW
    
    112
    -n3sU8TE2siRjA37i44xweg/LpQ9jqMsitLLbEBvuqvb0yQfz9q5nRlz/AA3Xmyr6FjyLW2+SOYxs
    
    113
    -AAVQAk/hg+tKbuG0i6EKT9+Uhdx/n+lRpp9yJF33S+SDny0QqR7bgR/KrUNjbW8hkihUSHOXPLcn
    
    114
    -JGT78/WuiMJ35kkvxZNyr9vWVgfs6SMp4wGYr/45xUv22Xn/AEZuPZ//AIirtFaKEv5vyAom9nxk
    
    115
    -WrEdScNwPpt5+gpC1/Jjamz6lVH/ALNV+ijkfVsLmbPdXVlbtLMuVUgEhQ3JOBjlfUdqcst1OA0Z
    
    116
    -fkcHYI1/Hdk/kPStCih03/MwuZ5TU+zx9f8AnqOn/funCPUO8i9P+eg/+Iq9RR7Nd397C5RMeoZ4
    
    117
    -kXHr5g/+IpANQRRuw+cA7GUke4yoFX6KPZru/vC5ltuDmSWGVXByGECsxP1UEfyqxDehgxYh1U4Z
    
    118
    -0/hI6hhnIIpNRtZ7uERRSIqE/OCOT3GDyOvYg5qJIZktPs/kuSFK78oAffjH8hWE1VpyXJdjVnua
    
    119
    -VFFFdZIUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUA
    
    120
    -FFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAH//2Q==</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>&lt;DIV STYLE="text-align:Left;"&gt;&lt;DIV&gt;&lt;P&gt;&lt;SPAN&gt;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.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;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.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;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&lt;/SPAN&gt;&lt;/P&gt;&lt;/DIV&gt;&lt;/DIV&gt;</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&amp;version=1.1.0&amp;request=GetMap&amp;layers=MarineRegions:boundaries</mdFileID><mdParentID>Marine Regions</mdParentID><dataSetURI>http://geo.vliz.be/geoserver/MarineRegions/wms?service=WMS&amp;version=1.1.0&amp;request=GetMap&amp;layers=MarineRegions:boundaries</dataSetURI><dqInfo xmlns=""><dqScope><scpLvl><ScopeCd value="005"/></scpLvl></dqScope><dataLineage><statement>Updates for Maritime Boundaries (EEZ) version 8
    
    121
    -
    
    122
    -
    
    123
    -- Singapore - Malaysia
    
    124
    -
    
    125
    -- New boundary between Colombia and Nicaragua
    
    126
    -
    
    127
    -- Malta (Continental Shelf)
    
    128
    -
    
    129
    -- Guyana - Suriname
    
    130
    -
    
    131
    -
    
    132
    -- Norway: create seperate polygon for the Fisheries Protection Zone around 
    
    133
    -   
    
    134
    -- Boundary Morocco - Mauritania
    
    135
    -
    
    136
    -- Maritime Dispute Chile-Peru
    
    137
    -
    
    138
    -- Split Guadeloupe and Martinique
    
    139
    -
    
    140
    -- Split US Virgin Islands and Puerto Rico
    
    141
    -
    
    142
    -- ISO Codes
    
    143
    - 
    
    144
    -- Error in the western boundary of the Wallis &amp; Futuna EEZ
    
    145
    -
    
    146
    -- Boundary Kenya - Somalia
    
    147
    -
    
    148
    -- Boundary UK - France, Celtic Sea
    
    149
    -
    
    150
    -- Boundary China/North Korea is disputed
    
    151
    -
    
    152
    -- Change terminology: 'disputed' in 'median line - disputed'
    
    153
    -
    
    154
    -- Boundary Tuvalu-Kiribati: agreed boundary: 
    
    155
    - 
    
    156
    -- Boundary New Caledonia (with Australia/Norfolk Island): continental shelf instead of EEZ
    
    157
    -
    
    158
    -- Congo (Kinshasa) has claimed 200 NM / territorial sea / baselines / and continental shelf 
    
    159
    - 
    
    160
    -- Include metadata in downloadfiles 
    
    161
    -
    
    162
    -- Update boundary Palmyra Atoll, based on http://www.nauticalcharts.noaa.gov/csdl/mbound.htm
    
    163
    -
    
    164
    -- Vanuatu EEZ boundary
    
    165
    -
    
    166
    -- Trinidad &amp; 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
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.cpg
    1
    +UTF-8
    \ No newline at end of file

  • client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.dbf
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.gpkg
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prjclient/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.prj
    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
    1
    +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
    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
    No preview for this file type
  • client/datasource/editor/common/src/main/map/shapeFiles/zee/eez_v11_lowres.shx
    No preview for this file type
  • client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter
    ... ... @@ -30,26 +30,29 @@ observe.data.ll.common.GearUseFeatures.generalTab
    30 30
     observe.data.ll.common.GearUseFeatures.measurementsTab
    
    31 31
     observe.data.ll.common.GearUseFeatures.number
    
    32 32
     observe.data.ll.common.GearUseFeatures.usedInTrip
    
    33
    -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount
    
    33
    +observe.data.ll.common.Trip.associatedActivityCount
    
    34
    +observe.data.ll.common.Trip.associatedFishingOperationCount
    
    34 35
     observe.data.ll.common.Trip.availableData
    
    35 36
     observe.data.ll.common.Trip.ersId
    
    36 37
     observe.data.ll.common.Trip.generalComment
    
    37 38
     observe.data.ll.common.Trip.generalTab
    
    38
    -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount
    
    39
    +observe.data.ll.common.Trip.logbookActivityCount
    
    39 40
     observe.data.ll.common.Trip.logbookAvailability
    
    40 41
     observe.data.ll.common.Trip.logbookComment
    
    41 42
     observe.data.ll.common.Trip.logbookDataEntryOperator
    
    42 43
     observe.data.ll.common.Trip.logbookDataQuality
    
    44
    +observe.data.ll.common.Trip.logbookFishingOperationCount
    
    43 45
     observe.data.ll.common.Trip.logbookTab
    
    44 46
     observe.data.ll.common.Trip.mapTab
    
    45 47
     observe.data.ll.common.Trip.noOfCrewMembers
    
    46 48
     observe.data.ll.common.Trip.noOfDays
    
    47 49
     observe.data.ll.common.Trip.observationMethod
    
    48
    -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount
    
    50
    +observe.data.ll.common.Trip.observationsActivityCount
    
    49 51
     observe.data.ll.common.Trip.observationsAvailability
    
    50 52
     observe.data.ll.common.Trip.observationsComment
    
    51 53
     observe.data.ll.common.Trip.observationsDataEntryOperator
    
    52 54
     observe.data.ll.common.Trip.observationsDataQuality
    
    55
    +observe.data.ll.common.Trip.observationsFishingOperationCount
    
    53 56
     observe.data.ll.common.Trip.observationsTab
    
    54 57
     observe.data.ll.common.Trip.species
    
    55 58
     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 @@
    180 180
                   </cell>
    
    181 181
                 </row>
    
    182 182
     
    
    183
    -            <!-- associatedActivityAndFishingOperationCount -->
    
    183
    +            <!-- associatedActivityCount -->
    
    184
    +            <!-- associatedFishingOperationCount -->
    
    184 185
                 <row>
    
    185 186
                   <cell columns='2'>
    
    186
    -                <JPanel id='associatedActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model">
    
    187
    -                  <JLabel id='associatedActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    188
    -                  <JLabel id='associatedActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    187
    +                <JPanel id='associatedActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model">
    
    188
    +                  <JPanel id='associatedActivityPanel' layout="{new BorderLayout()}">
    
    189
    +                    <JLabel id='associatedActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    190
    +                    <JLabel id='associatedActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    191
    +                  </JPanel>
    
    192
    +                  <JPanel id='associatedFishingOperationCountPanel' layout="{new BorderLayout()}">
    
    193
    +                    <JLabel id='associatedFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    194
    +                    <JLabel id='associatedFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    195
    +                  </JPanel>
    
    189 196
                     </JPanel>
    
    190 197
                   </cell>
    
    191 198
                 </row>
    
    ... ... @@ -267,12 +274,20 @@
    267 274
                     <JaxxComboBox id='observationsDataQuality' genericType='DataQualityReference' constructorParams='this'/>
    
    268 275
                   </cell>
    
    269 276
                 </row>
    
    270
    -            <!-- observationsActivityAndFishingOperationCount -->
    
    277
    +            <!-- observationsActivityCount -->
    
    278
    +            <!-- observationsFishingOperationCount -->
    
    271 279
                 <row>
    
    272 280
                   <cell columns='2'>
    
    273
    -                <JPanel id='observationsActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model">
    
    274
    -                  <JLabel id='observationsActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    275
    -                  <JLabel id='observationsActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    281
    +                <JPanel id='observationsActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model">
    
    282
    +                  <JPanel id='observationsActivityCountPanel' layout="{new BorderLayout()}">
    
    283
    +                    <JLabel id='observationsActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    284
    +                    <JLabel id='observationsActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    285
    +                  </JPanel>
    
    286
    +                  <JPanel id='observationsFishingOperationCountPanel' layout="{new BorderLayout()}">
    
    287
    +                    <JLabel id='observationsFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    288
    +                    <JLabel id='observationsFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    289
    +                  </JPanel>
    
    290
    +
    
    276 291
                     </JPanel>
    
    277 292
                   </cell>
    
    278 293
                 </row>
    
    ... ... @@ -309,12 +324,20 @@
    309 324
                     <JaxxComboBox id='logbookDataQuality' genericType='DataQualityReference' constructorParams='this'/>
    
    310 325
                   </cell>
    
    311 326
                 </row>
    
    312
    -            <!-- logbookActivityAndFishingOperationCount -->
    
    327
    +            <!-- logbookActivityCount -->
    
    328
    +            <!-- logbookFishingOperationCount -->
    
    313 329
                 <row>
    
    314 330
                   <cell columns='2' weightx="1">
    
    315
    -                <JPanel id='logbookActivityAndFishingOperationCountPanel' layout="{new BorderLayout()}" beanScope="model">
    
    316
    -                  <JLabel id='logbookActivityAndFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    317
    -                  <JLabel id='logbookActivityAndFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    331
    +                <JPanel id='logbookActivityAndFishingOperationCountPanel' layout="{new GridLayout(1, 0)}" beanScope="model">
    
    332
    +                  <JPanel id='logbookActivityCountPanel' layout="{new BorderLayout()}">
    
    333
    +                    <JLabel id='logbookActivityCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    334
    +                    <JLabel id='logbookActivityCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    335
    +                  </JPanel>
    
    336
    +                  <JPanel id='logbookFishingOperationCountPanel' layout="{new BorderLayout()}">
    
    337
    +                    <JLabel id='logbookFishingOperationCountLabel' styleClass="italic" constraints='BorderLayout.WEST'/>
    
    338
    +                    <JLabel id='logbookFishingOperationCount' styleClass="skipI18n" constraints='BorderLayout.CENTER'/>
    
    339
    +                  </JPanel>
    
    340
    +
    
    318 341
                     </JPanel>
    
    319 342
                   </cell>
    
    320 343
                 </row>
    

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss
    ... ... @@ -20,19 +20,34 @@
    20 20
      * #L%
    
    21 21
      */
    
    22 22
     
    
    23
    -#associatedActivityAndFishingOperationCount {
    
    23
    +#associatedActivityCount {
    
    24 24
       font-weight:bold;
    
    25
    -  text:{"     " + bean.getAssociatedActivityAndFishingOperationCount()};
    
    25
    +  text:{"     " + bean.getAssociatedActivityCount()};
    
    26 26
     }
    
    27 27
     
    
    28
    -#observationsActivityAndFishingOperationCount {
    
    28
    +#associatedFishingOperationCount {
    
    29 29
       font-weight:bold;
    
    30
    -  text:{"     " + bean.getObservationsActivityAndFishingOperationCount()};
    
    30
    +  text:{"     " + bean.getAssociatedFishingOperationCount()};
    
    31 31
     }
    
    32 32
     
    
    33
    -#logbookActivityAndFishingOperationCount {
    
    33
    +#observationsActivityCount {
    
    34 34
       font-weight:bold;
    
    35
    -  text:{"     " + bean.getLogbookActivityAndFishingOperationCount()};
    
    35
    +  text:{"     " + bean.getObservationsActivityCount()};
    
    36
    +}
    
    37
    +
    
    38
    +#observationsFishingOperationCount {
    
    39
    +  font-weight:bold;
    
    40
    +  text:{"     " + bean.getObservationsFishingOperationCount()};
    
    41
    +}
    
    42
    +
    
    43
    +#logbookActivityCount {
    
    44
    +  font-weight:bold;
    
    45
    +  text:{"     " + bean.getLogbookActivityCount()};
    
    46
    +}
    
    47
    +
    
    48
    +#logbookFishingOperationCount {
    
    49
    +  font-weight:bold;
    
    50
    +  text:{"     " + bean.getLogbookFishingOperationCount()};
    
    36 51
     }
    
    37 52
     
    
    38 53
     #startDate {
    

  • client/datasource/editor/ll/src/main/resources/map/ll-style.xml
    ... ... @@ -17,10 +17,10 @@
    17 17
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    18 18
       #L%
    
    19 19
       -->
    
    20
    -<StyledLayerDescriptor version="1.0.0"
    
    21
    -                       xmlns="http://www.opengis.net/sld"
    
    22
    -                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    
    20
    +<StyledLayerDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    
    23 21
                            xmlns:ogc="http://www.opengis.net/ogc"
    
    22
    +                       version="1.0.0"
    
    23
    +                       xmlns="http://www.opengis.net/sld"
    
    24 24
                            xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd
    
    25 25
                                                http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
    
    26 26
     
    
    ... ... @@ -117,7 +117,7 @@
    117 117
               </ogc:Filter>
    
    118 118
               <LineSymbolizer>
    
    119 119
                 <Stroke>
    
    120
    -              <CssParameter name="stroke">#00FF00</CssParameter>
    
    120
    +              <CssParameter name="stroke">${mapLlStyleObservationsLineTripColor}</CssParameter>
    
    121 121
                   <CssParameter name="stroke-width">2</CssParameter>
    
    122 122
                   <CssParameter name="stroke-dasharray">5 7</CssParameter>
    
    123 123
                 </Stroke>
    
    ... ... @@ -135,7 +135,7 @@
    135 135
               </ogc:Filter>
    
    136 136
               <LineSymbolizer>
    
    137 137
                 <Stroke>
    
    138
    -              <CssParameter name="stroke">#00FF00</CssParameter>
    
    138
    +              <CssParameter name="stroke">${mapLlStyleObservationsLineSettingColor}</CssParameter>
    
    139 139
                   <CssParameter name="stroke-width">2</CssParameter>
    
    140 140
                 </Stroke>
    
    141 141
               </LineSymbolizer>
    
    ... ... @@ -152,7 +152,7 @@
    152 152
               </ogc:Filter>
    
    153 153
               <LineSymbolizer>
    
    154 154
                 <Stroke>
    
    155
    -              <CssParameter name="stroke">#FFFF00</CssParameter>
    
    155
    +              <CssParameter name="stroke">${mapLlStyleObservationsLineHaulingColor}</CssParameter>
    
    156 156
                   <CssParameter name="stroke-width">2</CssParameter>
    
    157 157
                 </Stroke>
    
    158 158
               </LineSymbolizer>
    
    ... ... @@ -176,7 +176,7 @@
    176 176
               </ogc:Filter>
    
    177 177
               <LineSymbolizer>
    
    178 178
                 <Stroke>
    
    179
    -              <CssParameter name="stroke">#222222</CssParameter>
    
    179
    +              <CssParameter name="stroke">${mapLlStyleLogbookLineTripColor}</CssParameter>
    
    180 180
                   <CssParameter name="stroke-width">3</CssParameter>
    
    181 181
                   <CssParameter name="stroke-dasharray">5 7</CssParameter>
    
    182 182
                 </Stroke>
    
    ... ... @@ -194,7 +194,7 @@
    194 194
               </ogc:Filter>
    
    195 195
               <LineSymbolizer>
    
    196 196
                 <Stroke>
    
    197
    -              <CssParameter name="stroke">#FF0000</CssParameter>
    
    197
    +              <CssParameter name="stroke">${mapLlStyleLogbookLineSettingColor}</CssParameter>
    
    198 198
                   <CssParameter name="stroke-width">4</CssParameter>
    
    199 199
                 </Stroke>
    
    200 200
               </LineSymbolizer>
    
    ... ... @@ -211,7 +211,7 @@
    211 211
               </ogc:Filter>
    
    212 212
               <LineSymbolizer>
    
    213 213
                 <Stroke>
    
    214
    -              <CssParameter name="stroke">#00FFFF</CssParameter>
    
    214
    +              <CssParameter name="stroke">${mapLlStyleLogbookLineHaulingColor}</CssParameter>
    
    215 215
                   <CssParameter name="stroke-width">4</CssParameter>
    
    216 216
                 </Stroke>
    
    217 217
               </LineSymbolizer>
    
    ... ... @@ -240,7 +240,7 @@
    240 240
                   <Mark>
    
    241 241
                     <WellKnownName>ttf://Serif#U+00B7</WellKnownName>
    
    242 242
                     <Fill>
    
    243
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    243
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    244 244
                     </Fill>
    
    245 245
                     <Stroke>
    
    246 246
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -267,7 +267,7 @@
    267 267
                   <Mark>
    
    268 268
                     <WellKnownName>Triangle</WellKnownName>
    
    269 269
                     <Fill>
    
    270
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    270
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    271 271
                     </Fill>
    
    272 272
                     <Stroke>
    
    273 273
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -293,7 +293,7 @@
    293 293
                   <Mark>
    
    294 294
                     <WellKnownName>Square</WellKnownName>
    
    295 295
                     <Fill>
    
    296
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    296
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    297 297
                     </Fill>
    
    298 298
                     <Stroke>
    
    299 299
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -319,7 +319,7 @@
    319 319
                   <Mark>
    
    320 320
                     <WellKnownName>Circle</WellKnownName>
    
    321 321
                     <Fill>
    
    322
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    322
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    323 323
                     </Fill>
    
    324 324
                     <Stroke>
    
    325 325
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -345,7 +345,7 @@
    345 345
                   <Mark>
    
    346 346
                     <WellKnownName>X</WellKnownName>
    
    347 347
                     <Fill>
    
    348
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    348
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    349 349
                     </Fill>
    
    350 350
                     <Stroke>
    
    351 351
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -371,7 +371,7 @@
    371 371
                   <Mark>
    
    372 372
                     <WellKnownName>Star</WellKnownName>
    
    373 373
                     <Fill>
    
    374
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    374
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    375 375
                     </Fill>
    
    376 376
                     <Stroke>
    
    377 377
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -418,7 +418,7 @@
    418 418
                   <Mark>
    
    419 419
                     <WellKnownName>ttf://Serif#U+0021</WellKnownName>
    
    420 420
                     <Fill>
    
    421
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    421
    +                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    
    422 422
                     </Fill>
    
    423 423
                     <Stroke>
    
    424 424
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -454,7 +454,7 @@
    454 454
                   <Mark>
    
    455 455
                     <WellKnownName>ttf://Serif#U+00B7</WellKnownName>
    
    456 456
                     <Fill>
    
    457
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    457
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    458 458
                     </Fill>
    
    459 459
                     <Stroke>
    
    460 460
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -481,7 +481,7 @@
    481 481
                   <Mark>
    
    482 482
                     <WellKnownName>Triangle</WellKnownName>
    
    483 483
                     <Fill>
    
    484
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    484
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    485 485
                     </Fill>
    
    486 486
                     <Stroke>
    
    487 487
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -508,7 +508,7 @@
    508 508
                   <Mark>
    
    509 509
                     <WellKnownName>Square</WellKnownName>
    
    510 510
                     <Fill>
    
    511
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    511
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    512 512
                     </Fill>
    
    513 513
                     <Stroke>
    
    514 514
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -535,7 +535,7 @@
    535 535
                   <Mark>
    
    536 536
                     <WellKnownName>Circle</WellKnownName>
    
    537 537
                     <Fill>
    
    538
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    538
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    539 539
                     </Fill>
    
    540 540
                     <Stroke>
    
    541 541
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -562,7 +562,7 @@
    562 562
                   <Mark>
    
    563 563
                     <WellKnownName>X</WellKnownName>
    
    564 564
                     <Fill>
    
    565
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    565
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    566 566
                     </Fill>
    
    567 567
                     <Stroke>
    
    568 568
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -589,7 +589,7 @@
    589 589
                   <Mark>
    
    590 590
                     <WellKnownName>Star</WellKnownName>
    
    591 591
                     <Fill>
    
    592
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    592
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    593 593
                     </Fill>
    
    594 594
                     <Stroke>
    
    595 595
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -637,7 +637,7 @@
    637 637
                   <Mark>
    
    638 638
                     <WellKnownName>ttf://Serif#U+0021</WellKnownName>
    
    639 639
                     <Fill>
    
    640
    -                  <CssParameter name="fill">#FF0000</CssParameter>
    
    640
    +                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    
    641 641
                     </Fill>
    
    642 642
                     <Stroke>
    
    643 643
                       <CssParameter name="stroke">#000000</CssParameter>
    

  • client/datasource/editor/ps/src/main/resources/map/ps-style.xml
    ... ... @@ -17,10 +17,10 @@
    17 17
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    18 18
       #L%
    
    19 19
       -->
    
    20
    -<StyledLayerDescriptor version="1.0.0"
    
    21
    -                       xmlns="http://www.opengis.net/sld"
    
    22
    -                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    
    20
    +<StyledLayerDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    
    23 21
                            xmlns:ogc="http://www.opengis.net/ogc"
    
    22
    +                       version="1.0.0"
    
    23
    +                       xmlns="http://www.opengis.net/sld"
    
    24 24
                            xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd
    
    25 25
                                                http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
    
    26 26
     
    
    ... ... @@ -39,7 +39,7 @@
    39 39
               </ogc:Filter>
    
    40 40
               <LineSymbolizer>
    
    41 41
                 <Stroke>
    
    42
    -              <CssParameter name="stroke">#00FF00</CssParameter>
    
    42
    +              <CssParameter name="stroke">${mapPsStyleObservationsColor}</CssParameter>
    
    43 43
                   <CssParameter name="stroke-width">2</CssParameter>
    
    44 44
                 </Stroke>
    
    45 45
               </LineSymbolizer>
    
    ... ... @@ -74,7 +74,7 @@
    74 74
               </ogc:Filter>
    
    75 75
               <LineSymbolizer>
    
    76 76
                 <Stroke>
    
    77
    -              <CssParameter name="stroke">#00FF00</CssParameter>
    
    77
    +              <CssParameter name="stroke">${mapPsStyleObservationsColor}</CssParameter>
    
    78 78
                   <CssParameter name="stroke-width">2</CssParameter>
    
    79 79
                   <CssParameter name="stroke-dasharray">6 4</CssParameter>
    
    80 80
                 </Stroke>
    
    ... ... @@ -129,7 +129,7 @@
    129 129
                   <Mark>
    
    130 130
                     <WellKnownName>ttf://Serif#U+00B7</WellKnownName>
    
    131 131
                     <Fill>
    
    132
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    132
    +                  <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter>
    
    133 133
                     </Fill>
    
    134 134
                     <Stroke>
    
    135 135
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -156,7 +156,7 @@
    156 156
                   <Mark>
    
    157 157
                     <WellKnownName>ttf://Serif#U+25C6</WellKnownName>
    
    158 158
                     <Fill>
    
    159
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    159
    +                  <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter>
    
    160 160
                     </Fill>
    
    161 161
                     <Stroke>
    
    162 162
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -183,7 +183,7 @@
    183 183
                   <Mark>
    
    184 184
                     <WellKnownName>ttf://Serif#U+002B</WellKnownName>
    
    185 185
                     <Fill>
    
    186
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    186
    +                  <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter>
    
    187 187
                     </Fill>
    
    188 188
                     <Stroke>
    
    189 189
                       <CssParameter name="stroke">#000000</CssParameter>
    
    ... ... @@ -210,7 +210,7 @@
    210 210
                   <Mark>
    
    211 211
                     <WellKnownName>ttf://Serif#U+0021</WellKnownName>
    
    212 212
                     <Fill>
    
    213
    -                  <CssParameter name="fill">#00FF00</CssParameter>
    
    213
    +                  <CssParameter name="fill">${mapPsStyleObservationsColor}</CssParameter>
    
    214 214
                     </Fill>
    
    215 215
                     <Stroke>
    
    216 216
                       <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
    100 100
     observe.config.map.layer8.description=File (shapefile) for layer 8 of map
    
    101 101
     observe.config.map.layer9.description=File (shapefile) for layer 9 of map
    
    102 102
     observe.config.map.ll.style.description=[Longline] File of styles used in map
    
    103
    +observe.config.map.ll.style.logbook.line.hauling.color=[LL] Logbook Line hauling color
    
    104
    +observe.config.map.ll.style.logbook.line.setting.color=[LL] Logbook Line setting color
    
    105
    +observe.config.map.ll.style.logbook.line.trip.color=[LL] Logbook Line trip  color
    
    106
    +observe.config.map.ll.style.logbook.point.color=[LL] Logbook point color
    
    107
    +observe.config.map.ll.style.observations.line.hauling.color=[LL] Observations Line hauling color
    
    108
    +observe.config.map.ll.style.observations.line.setting.color=[LL] Observations Line setting color
    
    109
    +observe.config.map.ll.style.observations.line.trip.color=[LL] Observations Line trip color
    
    110
    +observe.config.map.ll.style.observations.point.color=[LL] Observations point color
    
    103 111
     observe.config.map.ps.style.description=[Seine] File of styles used in map
    
    112
    +observe.config.map.ps.style.observations.color=[Seine] Color for observations data
    
    104 113
     observe.config.navigationIconsPath.description=Default navigation icons path.
    
    105 114
     observe.config.observation.activitysDetaillees=Observation of detailled activities
    
    106 115
     observe.config.observation.fauneAssociee=Observation of non target
    
    ... ... @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Change program
    352 361
     observe.data.ll.common.Trip.action.move.choose.parent.message=Select target program
    
    353 362
     observe.data.ll.common.Trip.action.move.choose.parent.title=Move trips to another program
    
    354 363
     observe.data.ll.common.Trip.action.move.tip=Change program of trip(s)
    
    355
    -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Total associated activities / fishing operation count
    
    364
    +observe.data.ll.common.Trip.associatedActivityCount=Number of activities matched
    
    365
    +observe.data.ll.common.Trip.associatedFishingOperationCount=Number of fishing operations matched
    
    356 366
     observe.data.ll.common.Trip.availableData=Available data
    
    357 367
     observe.data.ll.common.Trip.ersId=Id ERS
    
    358 368
     observe.data.ll.common.Trip.generalComment=Comment
    
    ... ... @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=Common characteristics
    360 370
     observe.data.ll.common.Trip.list.message.none=No trip for current program
    
    361 371
     observe.data.ll.common.Trip.list.navigation.node=Trip
    
    362 372
     observe.data.ll.common.Trip.list.title=List of trips
    
    363
    -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Total logbook activities / fishing operation count
    
    373
    +observe.data.ll.common.Trip.logbookActivityCount=Number of activities
    
    364 374
     observe.data.ll.common.Trip.logbookAvailability=Logbook and associated data
    
    365 375
     observe.data.ll.common.Trip.logbookComment=Comment
    
    376
    +observe.data.ll.common.Trip.logbookFishingOperationCount=Number of fishing operations
    
    366 377
     observe.data.ll.common.Trip.logbookTab=Logbook and associated data
    
    367 378
     observe.data.ll.common.Trip.mapTab=Map
    
    368 379
     observe.data.ll.common.Trip.message.not.open=Current trip is not opened, no edit possible.
    
    369 380
     observe.data.ll.common.Trip.navigation.unsaved=New trip
    
    370 381
     observe.data.ll.common.Trip.noOfCrewMembers=Number of crew
    
    371 382
     observe.data.ll.common.Trip.noOfDays=Duration (days)
    
    372
    -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Total observed activities / fishing operation count
    
    383
    +observe.data.ll.common.Trip.observationsActivityCount=Number of activities
    
    373 384
     observe.data.ll.common.Trip.observationsAvailability=Observations
    
    374 385
     observe.data.ll.common.Trip.observationsComment=Comment
    
    386
    +observe.data.ll.common.Trip.observationsFishingOperationCount=Number of fishing operations
    
    375 387
     observe.data.ll.common.Trip.observationsTab=Observations
    
    376 388
     observe.data.ll.common.Trip.species=Target species
    
    377 389
     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
    100 100
     observe.config.map.layer8.description=Archivo (shapeFiles) del octavo calco del mapa
    
    101 101
     observe.config.map.layer9.description=Archivo (shapeFiles) del noveno calco del mapa
    
    102 102
     observe.config.map.ll.style.description=[Longline] Archivo de los estilos a aplicar sobre los calcos del mapa \#TODO
    
    103
    +observe.config.map.ll.style.logbook.line.hauling.color=[LL] Logbook Line hauling color
    
    104
    +observe.config.map.ll.style.logbook.line.setting.color=[LL] Logbook Line setting color
    
    105
    +observe.config.map.ll.style.logbook.line.trip.color=[LL] Logbook Line trip  color
    
    106
    +observe.config.map.ll.style.logbook.point.color=[LL] Logbook point color
    
    107
    +observe.config.map.ll.style.observations.line.hauling.color=[LL] Observations Line hauling color
    
    108
    +observe.config.map.ll.style.observations.line.setting.color=[LL] Observations Line setting color
    
    109
    +observe.config.map.ll.style.observations.line.trip.color=[LL] Observations Line trip color
    
    110
    +observe.config.map.ll.style.observations.point.color=[LL] Observations point color
    
    103 111
     observe.config.map.ps.style.description=[Seina] Archivo de los estilos a aplicar sobre los calcos del mapa \#TODO
    
    112
    +observe.config.map.ps.style.observations.color=[Seine] Color for observations data
    
    104 113
     observe.config.navigationIconsPath.description=Default navigation icons path. \#TODO
    
    105 114
     observe.config.observation.activitysDetaillees=Observación de actividades detalladas
    
    106 115
     observe.config.observation.fauneAssociee=Observación de Fauna asociada
    
    ... ... @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Reasignación del programa
    352 361
     observe.data.ll.common.Trip.action.move.choose.parent.message=A qué programa quiere asociar las mareas seleccionadas ?
    
    353 362
     observe.data.ll.common.Trip.action.move.choose.parent.title=Cambiar el programa de las mareas
    
    354 363
     observe.data.ll.common.Trip.action.move.tip=Cambiar el programme de mareas seleccionadas
    
    355
    -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Total associated activities / fishing operation count \#TODO
    
    364
    +observe.data.ll.common.Trip.associatedActivityCount=Número de actividades coincidentes
    
    365
    +observe.data.ll.common.Trip.associatedFishingOperationCount=Número de operaciones de pesca coincidentes
    
    356 366
     observe.data.ll.common.Trip.availableData=Données disponibles
    
    357 367
     observe.data.ll.common.Trip.ersId=Id ERS
    
    358 368
     observe.data.ll.common.Trip.generalComment=Comentarios
    
    ... ... @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=General características
    360 370
     observe.data.ll.common.Trip.list.message.none=Ninguna marea para el programa actual
    
    361 371
     observe.data.ll.common.Trip.list.navigation.node=Marea
    
    362 372
     observe.data.ll.common.Trip.list.title=List of trips
    
    363
    -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Total logbook activities / fishing operation count \#TODO
    
    373
    +observe.data.ll.common.Trip.logbookActivityCount=Número de actividades
    
    364 374
     observe.data.ll.common.Trip.logbookAvailability=Diario de pesca y datos asociados
    
    365 375
     observe.data.ll.common.Trip.logbookComment=Comentarios
    
    376
    +observe.data.ll.common.Trip.logbookFishingOperationCount=Número de operaciones de pesca
    
    366 377
     observe.data.ll.common.Trip.logbookTab=Diario de pesca y datos asociados
    
    367 378
     observe.data.ll.common.Trip.mapTab=Mapa
    
    368 379
     observe.data.ll.common.Trip.message.not.open=La marea actual no está abierta, no se puede modificar.
    
    369 380
     observe.data.ll.common.Trip.navigation.unsaved=Nueva marea
    
    370 381
     observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage
    
    371 382
     observe.data.ll.common.Trip.noOfDays=Duración (días)
    
    372
    -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Total observed activities / fishing operation count \#TODO
    
    383
    +observe.data.ll.common.Trip.observationsActivityCount=Número de actividades
    
    373 384
     observe.data.ll.common.Trip.observationsAvailability=Observaciones
    
    374 385
     observe.data.ll.common.Trip.observationsComment=Comentarios
    
    386
    +observe.data.ll.common.Trip.observationsFishingOperationCount=Número de operaciones de pesca
    
    375 387
     observe.data.ll.common.Trip.observationsTab=Observaciones
    
    376 388
     observe.data.ll.common.Trip.species=Especie objetivo
    
    377 389
     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
    99 99
     observe.config.map.layer7.description=Fichier (Shape Files) du septième calque de la carte
    
    100 100
     observe.config.map.layer8.description=Fichier (Shape Files) du huitième calque de la carte
    
    101 101
     observe.config.map.layer9.description=Fichier (Shape Files) du neuvième calque de la carte
    
    102
    -observe.config.map.ll.style.description=Fichier des style (Palangre) à appliquer sur les calques de la carte
    
    103
    -observe.config.map.ps.style.description=Fichier des style (Senne) à appliquer sur les calques de la carte
    
    102
    +observe.config.map.ll.style.description=[Palangre] Fichier des style à appliquer sur les calques de la carte
    
    103
    +observe.config.map.ll.style.logbook.line.hauling.color=[Palangre] Livre de bord Ligne Couleur virage
    
    104
    +observe.config.map.ll.style.logbook.line.setting.color=[Palangre] Livre de bord Ligne Couleur filage
    
    105
    +observe.config.map.ll.style.logbook.line.trip.color=[Palangre] Livre de bord Ligne Couleur marée
    
    106
    +observe.config.map.ll.style.logbook.point.color=[Palangre] Livre de bord Couleur points
    
    107
    +observe.config.map.ll.style.observations.line.hauling.color=[Palangre] Observations Ligne Couleur virage
    
    108
    +observe.config.map.ll.style.observations.line.setting.color=[Palangre] Observations Ligne Couleur filage
    
    109
    +observe.config.map.ll.style.observations.line.trip.color=[Palangre] Observations Ligne Couleur marée
    
    110
    +observe.config.map.ll.style.observations.point.color=[Palangre] Observations Couleur points
    
    111
    +observe.config.map.ps.style.description=[Senne] Fichier des style à appliquer sur les calques de la carte
    
    112
    +observe.config.map.ps.style.observations.color=[Senne] Couleur pour les données d'observation
    
    104 113
     observe.config.navigationIconsPath.description=Chemin vers les icônes de navigation.
    
    105 114
     observe.config.observation.activitysDetaillees=Observation des activités détaillées
    
    106 115
     observe.config.observation.fauneAssociee=Observation des Faunes associées
    
    ... ... @@ -352,7 +361,8 @@ observe.data.ll.common.Trip.action.move=Réallocation du programme
    352 361
     observe.data.ll.common.Trip.action.move.choose.parent.message=A quel programme voulez-vous associer les marées sélectionnées ?
    
    353 362
     observe.data.ll.common.Trip.action.move.choose.parent.title=Changer le programme des marées
    
    354 363
     observe.data.ll.common.Trip.action.move.tip=Changer le programme des marées sélectionnées
    
    355
    -observe.data.ll.common.Trip.associatedActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche mises en correspondance
    
    364
    +observe.data.ll.common.Trip.associatedActivityCount=Nombres d'activités associées
    
    365
    +observe.data.ll.common.Trip.associatedFishingOperationCount=Nombre d'opérations de pêche associées
    
    356 366
     observe.data.ll.common.Trip.availableData=Données disponibles
    
    357 367
     observe.data.ll.common.Trip.ersId=Id ERS
    
    358 368
     observe.data.ll.common.Trip.generalComment=Commentaire
    
    ... ... @@ -360,18 +370,20 @@ observe.data.ll.common.Trip.generalTab=Caractéristiques communes
    360 370
     observe.data.ll.common.Trip.list.message.none=Aucune marée pour le programme courant
    
    361 371
     observe.data.ll.common.Trip.list.navigation.node=Marée
    
    362 372
     observe.data.ll.common.Trip.list.title=Liste de marées
    
    363
    -observe.data.ll.common.Trip.logbookActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche livre de bord
    
    373
    +observe.data.ll.common.Trip.logbookActivityCount=Nombres d'activités
    
    364 374
     observe.data.ll.common.Trip.logbookAvailability=Livre de bord et données associées
    
    365 375
     observe.data.ll.common.Trip.logbookComment=Commentaire
    
    376
    +observe.data.ll.common.Trip.logbookFishingOperationCount=Nombre d'opérations de pêche
    
    366 377
     observe.data.ll.common.Trip.logbookTab=Livre de bord et données associées
    
    367 378
     observe.data.ll.common.Trip.mapTab=Carte
    
    368 379
     observe.data.ll.common.Trip.message.not.open=La marée courante n'est pas ouverte, aucune modification possible.
    
    369 380
     observe.data.ll.common.Trip.navigation.unsaved=Nouvelle marée
    
    370 381
     observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage
    
    371 382
     observe.data.ll.common.Trip.noOfDays=Durée (jours)
    
    372
    -observe.data.ll.common.Trip.observationsActivityAndFishingOperationCount=Nombres d'activités / d'opérations de pêche observées
    
    383
    +observe.data.ll.common.Trip.observationsActivityCount=Nombres d'activités
    
    373 384
     observe.data.ll.common.Trip.observationsAvailability=Données d'observation
    
    374 385
     observe.data.ll.common.Trip.observationsComment=Commentaire
    
    386
    +observe.data.ll.common.Trip.observationsFishingOperationCount=Nombre d'opérations de pêche
    
    375 387
     observe.data.ll.common.Trip.observationsTab=Données d'observation
    
    376 388
     observe.data.ll.common.Trip.species=Espèces ciblées
    
    377 389
     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 {
    87 87
     
    
    88 88
         List<File> getMapLayerFiles();
    
    89 89
     
    
    90
    +    Color getMapPsStyleObservationsColor();
    
    91
    +
    
    92
    +    File getTemporaryDirectory();
    
    93
    +
    
    94
    +    Color getMapLlStyleObservationsLineTripColor();
    
    95
    +
    
    96
    +    Color getMapLlStyleObservationsLineSettingColor();
    
    97
    +
    
    98
    +    Color getMapLlStyleObservationsLineHaulingColor();
    
    99
    +
    
    100
    +    Color getMapLlStyleObservationsPointColor();
    
    101
    +
    
    102
    +    Color getMapLlStyleLogbookLineTripColor();
    
    103
    +
    
    104
    +    Color getMapLlStyleLogbookLineSettingColor();
    
    105
    +
    
    106
    +    Color getMapLlStyleLogbookLineHaulingColor();
    
    107
    +
    
    108
    +    Color getMapLlStyleLogbookPointColor();
    
    90 109
     }

  • models/dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java
    ... ... @@ -57,54 +57,6 @@ public class TripDto extends GeneratedTripDto {
    57 57
             super.setStartDate(startDate == null ? null : DateUtil.getDay(startDate));
    
    58 58
         }
    
    59 59
     
    
    60
    -    @Override
    
    61
    -    public void setObservationsActivityCount(int observationsActivityCount) {
    
    62
    -        super.setObservationsActivityCount(observationsActivityCount);
    
    63
    -        firePropertyChange("observationsActivityAndFishingOperationCount", getObservationsActivityAndFishingOperationCount());
    
    64
    -    }
    
    65
    -
    
    66
    -    @Override
    
    67
    -    public void setObservationsFishingOperationCount(int observationsFishingOperationCount) {
    
    68
    -        super.setObservationsFishingOperationCount(observationsFishingOperationCount);
    
    69
    -        firePropertyChange("observationsActivityAndFishingOperationCount", getObservationsActivityAndFishingOperationCount());
    
    70
    -    }
    
    71
    -
    
    72
    -    public String getObservationsActivityAndFishingOperationCount() {
    
    73
    -        return String.format("%d / %d", getObservationsActivityCount(), getObservationsFishingOperationCount());
    
    74
    -    }
    
    75
    -
    
    76
    -    @Override
    
    77
    -    public void setLogbookActivityCount(int logbookActivityCount) {
    
    78
    -        super.setLogbookActivityCount(logbookActivityCount);
    
    79
    -        firePropertyChange("logbookActivityAndFishingOperationCount", getLogbookActivityAndFishingOperationCount());
    
    80
    -    }
    
    81
    -
    
    82
    -    @Override
    
    83
    -    public void setLogbookFishingOperationCount(int logbookFishingOperationCount) {
    
    84
    -        super.setLogbookFishingOperationCount(logbookFishingOperationCount);
    
    85
    -        firePropertyChange("logbookActivityAndFishingOperationCount", getLogbookActivityAndFishingOperationCount());
    
    86
    -    }
    
    87
    -
    
    88
    -    public String getLogbookActivityAndFishingOperationCount() {
    
    89
    -        return String.format("%d / %d", getLogbookActivityCount(), getLogbookFishingOperationCount());
    
    90
    -    }
    
    91
    -
    
    92
    -    @Override
    
    93
    -    public void setAssociatedActivityCount(int associatedActivityCount) {
    
    94
    -        super.setAssociatedActivityCount(associatedActivityCount);
    
    95
    -        firePropertyChange("associatedActivityAndFishingOperationCount", getAssociatedActivityAndFishingOperationCount());
    
    96
    -    }
    
    97
    -
    
    98
    -    @Override
    
    99
    -    public void setAssociatedFishingOperationCount(int associatedFishingOperationCount) {
    
    100
    -        super.setAssociatedFishingOperationCount(associatedFishingOperationCount);
    
    101
    -        firePropertyChange("associatedActivityAndFishingOperationCount", getAssociatedActivityAndFishingOperationCount());
    
    102
    -    }
    
    103
    -
    
    104
    -    public String getAssociatedActivityAndFishingOperationCount() {
    
    105
    -        return String.format("%d / %d", getAssociatedActivityCount(), getAssociatedFishingOperationCount());
    
    106
    -    }
    
    107
    -
    
    108 60
         public void updateNoOfDays() {
    
    109 61
             setNoOfDays(createNoOfDay(startDate, endDate));
    
    110 62
         }