[Observe-commits] branch develop updated (55dc897 -> 8d697dd)

23 Apr 2015

      This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository observe.

See http://git.codelutin.com/observe.git

      from  55dc897   utilisation jaxx 2.24
       new  8bf60a0   add compute trip for map
       new  b274065   add shape file and options map in config
       new  17ea514   add map in trip seine UI
       new  81c2490   mouse Translation
       new  359c028   fix show config
       new  66db93d   add french translation fr i18n
       new  cf8ec92   rename functions
       new  a4708e9   add point and fix style
       new  e44444d   add Date on map
       new  fefdf5a   use style file for map
       new  37c7ac8   zoom (or un-zoom) on pointer
       new  f1866ba   add layers
       new  f5ab898   fix zoom
       new  a96d031   refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path
       new  8638603   refs #6944 creation de la resources sur la partie catographie dans le build
       new  e76b828   refs #6944 copie des resources de cartographie
       new  408d5ec   fix zoom NPE
       new  6ca2e47   add scale mpa and creat jaxx file for map
       new  09f5a0a   fix default values map options
       new  5234784   move scale in map and add compass
       new  706ff1e   fix code, hide actions buttons, tab name
       new  057d0c1   add map in trip long line ui
       new  4b0a2bf   change trip map point type values, add style for longline,
       new  5486969   permettre d'interagir avec la carte même sur une marée clôturée (refs #6944)
       new  2559ebd   add export map into png, fix zoomIt in launch
       new  77880e6   accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944)
       new  1c9d89c   add legend
       new  d12d960   compute trip only if trip has change
       new  e155b2b   fix API + update i18n
       new  e106041   add some icons to popup menu + add NPG in filter (refs #6944)
       new  8d697dd   fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop

The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Detailed log of new commits:

commit 8d697dd28b6b48a3fd2ebb1aecf35e152a134e58
Merge: 55dc897 e106041
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Apr 23 17:37:04 2015 +0200

    fixes #6944: Tracer une carte de la marée
    Merge branch 'feature/6944' into develop

commit e10604196f027d38e4f62f707498a4575fd86028
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Apr 23 17:34:59 2015 +0200

    add some icons to popup menu + add NPG in filter (refs #6944)

commit e155b2b116c5f76303f19c0e0de25a64e593f30f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Apr 23 16:09:58 2015 +0200

    fix API + update i18n

commit d12d9609197e84435830b661956b56ea5cc9d092
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 23 14:31:45 2015 +0200

    compute trip only if trip has change

commit 1c9d89caed761cd189a2e2f3d9d4d4888bf67910
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 23 14:06:55 2015 +0200

    add legend

commit 77880e6a816382656bbc47016fab19c18f38b8e5
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Apr 22 18:46:37 2015 +0200

    accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944)

commit 2559ebd0b0b5da17932f9045cb4f4efd0a5d7dd3
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Wed Apr 22 17:35:56 2015 +0200

    add export map into png, fix zoomIt in launch

commit 5486969b64b7000acd78c26b603583db1cb8310a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Apr 22 16:34:04 2015 +0200

    permettre d'interagir avec la carte même sur une marée clôturée (refs #6944)

commit 4b0a2bfc28050d3f0ea3afa4615ec87d35debb0c
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Wed Apr 22 15:36:38 2015 +0200

    change trip map point type values, add style for longline,

commit 057d0c1b1c99810b5688aa050c776477268509e5
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Wed Apr 22 14:13:33 2015 +0200

    add map in trip long line ui

commit 706ff1e49847a069662a1035501899c6a5957e2e
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Apr 21 18:05:42 2015 +0200

    fix code, hide actions buttons, tab name

commit 52347840205301005a3727a66ab10f7390de4269
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Apr 21 16:18:29 2015 +0200

    move scale in map and add compass

commit 09f5a0abc67c879f320fefb961cdd6c6b8d3fe56
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Apr 21 10:33:51 2015 +0200

    fix default values map options

commit 6ca2e47cefc96c9bc2aae13d328396760d659f5b
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Apr 21 10:20:21 2015 +0200

    add scale mpa and creat jaxx file for map

commit 408d5ece1ef652b23dec9726b21816466dc8dc5d
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Mon Apr 20 10:33:20 2015 +0200

    fix zoom NPE

commit e76b828e333cd18178348462ec6090e39b80efbd
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Apr 20 19:49:39 2015 +0200

    refs #6944 copie des resources de cartographie

commit 8638603181f685262a59fb99a633705567e238ae
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Apr 20 19:42:46 2015 +0200

    refs #6944 creation de la resources sur la partie catographie dans le build

commit a96d03177f14ea4ddf5fbf97fd77f5dc8ee8b58d
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Apr 20 19:41:54 2015 +0200

    refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path

commit f5ab898697a3ad37907ae4e9d2e5f43ae5c3cd09
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Apr 17 17:35:08 2015 +0200

    fix zoom

commit f1866ba606dbafefa364086647ebb33cb2b92fc4
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Apr 17 17:31:40 2015 +0200

    add layers

commit 37c7ac8019237246ae537bc8d93e5e9e599c0602
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Apr 17 16:08:47 2015 +0200

    zoom (or un-zoom) on pointer

commit fefdf5a5ac3e318b6e0aa17ca560022b56414b6d
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Apr 17 15:16:05 2015 +0200

    use style file for map

commit e44444d950d4af380d0bbeb915cd63d73581f369
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 17:52:10 2015 +0200

    add Date on map

commit a4708e9b8dff945409d88167fc98e2db06b287a3
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 16:09:54 2015 +0200

    add point and fix style

commit cf8ec923072d4621b596da768e55a58045026e29
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 15:52:51 2015 +0200

    rename functions

commit 66db93d60c9fbecb33da89ca3c2f659b92c9fb68
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 11:17:32 2015 +0200

    add french translation fr i18n

commit 359c028843fbc3e4ce9dad244fc0b0b5b1f527ee
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 11:06:37 2015 +0200

    fix show config

commit 81c2490d90066d8abadd30e73342c2984ab53bc3
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 10:55:22 2015 +0200

    mouse Translation

commit 17ea5148801ad9627c460e9a8f8d68610cbdc8f5
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 08:58:08 2015 +0200

    add map in trip seine UI

commit b2740651068b527d34a09e6423d53139bf37a3b0
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 08:56:52 2015 +0200

    add shape file and options map in config

commit 8bf60a023df873422bedf6003ce44c6c37e09707
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Apr 16 08:42:39 2015 +0200

    add compute trip for map

Summary of changes:
 .../src/main/java/fr/ird/observe/DataService.java  |  39 ++
 .../main/java/fr/ird/observe/IObserveConfig.java   |   2 +
 .../entities/longline/TripLonglineDAOImpl.java     | 143 +++++
 .../observe/entities/seine/TripSeineDAOImpl.java   | 106 ++++
 .../java/fr/ird/observe/tripMap/TripMapPoint.java  |  49 ++
 .../fr/ird/observe/tripMap/TripMapPointType.java   |  34 ++
 .../i18n/observe-entities_en_GB.properties         |  12 +
 .../i18n/observe-entities_es_ES.properties         |  12 +
 .../i18n/observe-entities_fr_FR.properties         |  12 +
 observe-swing/pom.xml                              |  48 ++
 observe-swing/src/license/THIRD-PARTY.properties   |  23 +-
 observe-swing/src/main/assembly/map.xml            |  20 +
 .../src/main/filters/observe-ui.properties         |   1 +
 .../main/java/fr/ird/observe/ObserveConfig.java    |  76 +--
 .../java/fr/ird/observe/ObserveConfigOption.java   | 127 ++++-
 .../fr/ird/observe/ObserveResourceManager.java     |  28 +-
 .../main/java/fr/ird/observe/ObserveRunner.java    |  12 +-
 .../ird/observe/ui/actions/ShowConfigAction.java   |  32 +-
 .../observe/ui/content/ContentUIInitializer.java   |   4 +-
 .../content/open/impl/longline/TripLonglineUI.css  |   8 +
 .../content/open/impl/longline/TripLonglineUI.jaxx | 286 +++++-----
 .../open/impl/longline/TripLonglineUIHandler.java  |  52 ++
 .../ui/content/open/impl/seine/TripSeineUI.css     |   8 +
 .../ui/content/open/impl/seine/TripSeineUI.jaxx    | 322 +++++------
 .../open/impl/seine/TripSeineUIHandler.java        |  56 +-
 .../observe/ui/util/tripMap/ObserveMapPane.java    | 308 ++++++++++
 .../ui/util/tripMap/ObserveMapPaneLegendItem.java  |  69 +++
 .../util/tripMap/ObserverMapPanLegendDrawer.java   |  95 ++++
 .../fr/ird/observe/ui/util/tripMap/TripMapUI.css   |  12 +
 .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx  |  29 +
 .../observe/ui/util/tripMap/TripMapUIHandler.java  | 620 +++++++++++++++++++++
 .../map/shapeFiles/borders/WDBII_border_l_L1.dbf   | Bin 0 -> 40956 bytes
 .../map/shapeFiles/borders/WDBII_border_l_L1.prj   |   1 +
 .../map/shapeFiles/borders/WDBII_border_l_L1.shp   | Bin 0 -> 139420 bytes
 .../map/shapeFiles/borders/WDBII_border_l_L1.shx   | Bin 0 -> 3692 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L1.dbf  | Bin 0 -> 1227230 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L1.prj  |   1 +
 .../main/map/shapeFiles/continents/GSHHS_l_L1.shp  | Bin 0 -> 1221404 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L1.shx  | Bin 0 -> 45756 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L6.dbf  | Bin 0 -> 20435 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L6.prj  |   1 +
 .../main/map/shapeFiles/continents/GSHHS_l_L6.shp  | Bin 0 -> 48740 bytes
 .../main/map/shapeFiles/continents/GSHHS_l_L6.shx  | Bin 0 -> 852 bytes
 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf     | Bin 0 -> 939130 bytes
 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj     |   1 +
 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp     | Bin 0 -> 721340 bytes
 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx     | Bin 0 -> 35036 bytes
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf  | Bin 0 -> 177553 bytes
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.prj  |   1 +
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn  | Bin 0 -> 2852 bytes
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx  | Bin 0 -> 372 bytes
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shp  | Bin 0 -> 5091908 bytes
 .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml   | 147 +++++
 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shx  | Bin 0 -> 2092 bytes
 observe-swing/src/main/map/style.xml               | 317 +++++++++++
 .../resources/i18n/observe-swing_en_GB.properties  |  48 ++
 .../resources/i18n/observe-swing_es_ES.properties  |  48 ++
 .../resources/i18n/observe-swing_fr_FR.properties  |  39 ++
 .../src/main/resources/icons/action-center.png     | Bin 0 -> 797 bytes
 observe-swing/src/main/resources/log4j.properties  |   2 +
 pom.xml                                            |  75 ++-
 61 files changed, 2956 insertions(+), 370 deletions(-)
 create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java
 create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java
 create mode 100644 observe-swing/src/main/assembly/map.xml
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx
 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java
 create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf
 create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj
 create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp
 create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp
 create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx
 create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf
 create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj
 create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp
 create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml
 create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx
 create mode 100644 observe-swing/src/main/map/style.xml
 create mode 100644 observe-swing/src/main/resources/icons/action-center.png

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

[Observe-commits] branch develop updated (55dc897 -> 8d697dd)

codelutin.com scm