This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit d6992ad16979e0a15eaa42ae32147ccfbd08a40d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 17 08:12:08 2014 +0100 refs #6271 move gis resources to service module (used for tests) --- .../gis/lizmap/resources/France&Spain.dbf | Bin 0 -> 277 bytes .../gis/lizmap/resources/France&Spain.prj | 1 + .../gis/lizmap/resources/France&Spain.qpj | 1 + .../gis/lizmap/resources/France&Spain.shp | Bin 0 -> 1692536 bytes .../gis/lizmap/resources/France&Spain.shx | Bin 0 -> 116 bytes .../resources/gis/lizmap/resources/pelgas09.avl | 1134 ++++++++++++++++++++ .../resources/gis/lizmap/resources/pelgas09.dbf | Bin 0 -> 434 bytes .../resources/gis/lizmap/resources/pelgas09.qix | Bin 0 -> 152 bytes .../resources/gis/lizmap/resources/pelgas09.shp | Bin 0 -> 896940 bytes .../resources/gis/lizmap/resources/pelgas09.shx | Bin 0 -> 196 bytes 10 files changed, 1136 insertions(+) diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.dbf b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.dbf new file mode 100644 index 0000000..7110876 Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.dbf differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.prj b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.prj new file mode 100644 index 0000000..a30c00a --- /dev/null +++ b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.prj @@ -0,0 +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 diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.qpj b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.qpj new file mode 100644 index 0000000..5fbc831 --- /dev/null +++ b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.qpj @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shp b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shp new file mode 100644 index 0000000..4ccb26f Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shp differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shx b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shx new file mode 100644 index 0000000..178781e Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/France&Spain.shx differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.avl b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.avl new file mode 100644 index 0000000..324489c --- /dev/null +++ b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.avl @@ -0,0 +1,1134 @@ +/3.1 +(ODB.1 + FirstRootClassName: "Legend" + Roots: 2 + Version: 32 +) + +(Legend.2 + LegType: 0x04 + ClassType: 0x03 + FieldNames: 3 + Symbols: 4 + Class: 192 + Class: 193 + Class: 194 + Class: 195 + Class: 196 + Class: 197 + Class: 198 + Class: 199 + Class: 200 + Class: 201 + Class: 202 + StdDevs: 1.00000000000000 + NullSym: 203 + NullValues: 210 + StatValues: 211 +) + +(AVStr.3 + S: "D4" +) + +(SymList.4 + Child: 5 + Child: 23 + Child: 41 + Child: 59 + Child: 77 + Child: 95 + Child: 113 + Child: 131 + Child: 149 + Child: 167 + Child: 185 +) + +(CMkSym.5 + Color: 6 + Symbols: 7 + BgColor: 22 + Size: 1.00000000000000 +) + +(TClr.6 + Red: 0xffff +) + +(SymList.7 + Child: 8 + Child: 15 +) + +(BMkSym.8 + Color: 9 + BgColor: 10 + Font: 11 + Size: 1.00000000000000 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.9 + Red: 0xffff +) + +(TClr.10 + Name: "Transparent" +) + +(NFont.11 + Family: 12 + Name: 13 + Style: 14 + Weight: 1 + Wideness: 1 +) + +(AVStr.12 + S: "ESRI Geometric Symbols" +) + +(AVStr.13 + S: "ESRI Geometric Symbols" +) + +(AVStr.14 + S: "Normal" +) + +(BMkSym.15 + Color: 16 + ColorLock: 1 + BgColor: 17 + Font: 18 + Size: 1.00000000000000 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.16 +) + +(TClr.17 + Name: "Transparent" +) + +(NFont.18 + Family: 19 + Name: 20 + Style: 21 + Weight: 1 + Wideness: 1 +) + +(AVStr.19 + S: "ESRI Geometric Symbols" +) + +(AVStr.20 + S: "ESRI Geometric Symbols" +) + +(AVStr.21 + S: "Normal" +) + +(TClr.22 + Name: "Transparent" +) + +(CMkSym.23 + Color: 24 + Symbols: 25 + BgColor: 40 + Size: 3.55555555555556 +) + +(TClr.24 + Red: 0xffff +) + +(SymList.25 + Child: 26 + Child: 33 +) + +(BMkSym.26 + Color: 27 + BgColor: 28 + Font: 29 + Size: 3.55555555555556 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.27 + Red: 0xffff +) + +(TClr.28 + Name: "Transparent" +) + +(NFont.29 + Family: 30 + Name: 31 + Style: 32 + Weight: 1 + Wideness: 1 +) + +(AVStr.30 + S: "ESRI Geometric Symbols" +) + +(AVStr.31 + S: "ESRI Geometric Symbols" +) + +(AVStr.32 + S: "Normal" +) + +(BMkSym.33 + Color: 34 + ColorLock: 1 + BgColor: 35 + Font: 36 + Size: 3.55555555555556 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.34 +) + +(TClr.35 + Name: "Transparent" +) + +(NFont.36 + Family: 37 + Name: 38 + Style: 39 + Weight: 1 + Wideness: 1 +) + +(AVStr.37 + S: "ESRI Geometric Symbols" +) + +(AVStr.38 + S: "ESRI Geometric Symbols" +) + +(AVStr.39 + S: "Normal" +) + +(TClr.40 + Name: "Transparent" +) + +(CMkSym.41 + Color: 42 + Symbols: 43 + BgColor: 58 + Size: 6.11111111111111 +) + +(TClr.42 + Red: 0xffff +) + +(SymList.43 + Child: 44 + Child: 51 +) + +(BMkSym.44 + Color: 45 + BgColor: 46 + Font: 47 + Size: 6.11111111111111 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.45 + Red: 0xffff +) + +(TClr.46 + Name: "Transparent" +) + +(NFont.47 + Family: 48 + Name: 49 + Style: 50 + Weight: 1 + Wideness: 1 +) + +(AVStr.48 + S: "ESRI Geometric Symbols" +) + +(AVStr.49 + S: "ESRI Geometric Symbols" +) + +(AVStr.50 + S: "Normal" +) + +(BMkSym.51 + Color: 52 + ColorLock: 1 + BgColor: 53 + Font: 54 + Size: 6.11111111111111 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.52 +) + +(TClr.53 + Name: "Transparent" +) + +(NFont.54 + Family: 55 + Name: 56 + Style: 57 + Weight: 1 + Wideness: 1 +) + +(AVStr.55 + S: "ESRI Geometric Symbols" +) + +(AVStr.56 + S: "ESRI Geometric Symbols" +) + +(AVStr.57 + S: "Normal" +) + +(TClr.58 + Name: "Transparent" +) + +(CMkSym.59 + Color: 60 + Symbols: 61 + BgColor: 76 + Size: 8.66666666666667 +) + +(TClr.60 + Red: 0xffff +) + +(SymList.61 + Child: 62 + Child: 69 +) + +(BMkSym.62 + Color: 63 + BgColor: 64 + Font: 65 + Size: 8.66666666666667 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.63 + Red: 0xffff +) + +(TClr.64 + Name: "Transparent" +) + +(NFont.65 + Family: 66 + Name: 67 + Style: 68 + Weight: 1 + Wideness: 1 +) + +(AVStr.66 + S: "ESRI Geometric Symbols" +) + +(AVStr.67 + S: "ESRI Geometric Symbols" +) + +(AVStr.68 + S: "Normal" +) + +(BMkSym.69 + Color: 70 + ColorLock: 1 + BgColor: 71 + Font: 72 + Size: 8.66666666666667 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.70 +) + +(TClr.71 + Name: "Transparent" +) + +(NFont.72 + Family: 73 + Name: 74 + Style: 75 + Weight: 1 + Wideness: 1 +) + +(AVStr.73 + S: "ESRI Geometric Symbols" +) + +(AVStr.74 + S: "ESRI Geometric Symbols" +) + +(AVStr.75 + S: "Normal" +) + +(TClr.76 + Name: "Transparent" +) + +(CMkSym.77 + Color: 78 + Symbols: 79 + BgColor: 94 + Size: 11.22222222222222 +) + +(TClr.78 + Red: 0xffff +) + +(SymList.79 + Child: 80 + Child: 87 +) + +(BMkSym.80 + Color: 81 + BgColor: 82 + Font: 83 + Size: 11.22222222222222 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.81 + Red: 0xffff +) + +(TClr.82 + Name: "Transparent" +) + +(NFont.83 + Family: 84 + Name: 85 + Style: 86 + Weight: 1 + Wideness: 1 +) + +(AVStr.84 + S: "ESRI Geometric Symbols" +) + +(AVStr.85 + S: "ESRI Geometric Symbols" +) + +(AVStr.86 + S: "Normal" +) + +(BMkSym.87 + Color: 88 + ColorLock: 1 + BgColor: 89 + Font: 90 + Size: 11.22222222222222 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.88 +) + +(TClr.89 + Name: "Transparent" +) + +(NFont.90 + Family: 91 + Name: 92 + Style: 93 + Weight: 1 + Wideness: 1 +) + +(AVStr.91 + S: "ESRI Geometric Symbols" +) + +(AVStr.92 + S: "ESRI Geometric Symbols" +) + +(AVStr.93 + S: "Normal" +) + +(TClr.94 + Name: "Transparent" +) + +(CMkSym.95 + Color: 96 + Symbols: 97 + BgColor: 112 + Size: 13.77777777777778 +) + +(TClr.96 + Red: 0xffff +) + +(SymList.97 + Child: 98 + Child: 105 +) + +(BMkSym.98 + Color: 99 + BgColor: 100 + Font: 101 + Size: 13.77777777777778 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.99 + Red: 0xffff +) + +(TClr.100 + Name: "Transparent" +) + +(NFont.101 + Family: 102 + Name: 103 + Style: 104 + Weight: 1 + Wideness: 1 +) + +(AVStr.102 + S: "ESRI Geometric Symbols" +) + +(AVStr.103 + S: "ESRI Geometric Symbols" +) + +(AVStr.104 + S: "Normal" +) + +(BMkSym.105 + Color: 106 + ColorLock: 1 + BgColor: 107 + Font: 108 + Size: 13.77777777777778 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.106 +) + +(TClr.107 + Name: "Transparent" +) + +(NFont.108 + Family: 109 + Name: 110 + Style: 111 + Weight: 1 + Wideness: 1 +) + +(AVStr.109 + S: "ESRI Geometric Symbols" +) + +(AVStr.110 + S: "ESRI Geometric Symbols" +) + +(AVStr.111 + S: "Normal" +) + +(TClr.112 + Name: "Transparent" +) + +(CMkSym.113 + Color: 114 + Symbols: 115 + BgColor: 130 + Size: 16.33333333333333 +) + +(TClr.114 + Red: 0xffff +) + +(SymList.115 + Child: 116 + Child: 123 +) + +(BMkSym.116 + Color: 117 + BgColor: 118 + Font: 119 + Size: 16.33333333333333 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.117 + Red: 0xffff +) + +(TClr.118 + Name: "Transparent" +) + +(NFont.119 + Family: 120 + Name: 121 + Style: 122 + Weight: 1 + Wideness: 1 +) + +(AVStr.120 + S: "ESRI Geometric Symbols" +) + +(AVStr.121 + S: "ESRI Geometric Symbols" +) + +(AVStr.122 + S: "Normal" +) + +(BMkSym.123 + Color: 124 + ColorLock: 1 + BgColor: 125 + Font: 126 + Size: 16.33333333333333 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.124 +) + +(TClr.125 + Name: "Transparent" +) + +(NFont.126 + Family: 127 + Name: 128 + Style: 129 + Weight: 1 + Wideness: 1 +) + +(AVStr.127 + S: "ESRI Geometric Symbols" +) + +(AVStr.128 + S: "ESRI Geometric Symbols" +) + +(AVStr.129 + S: "Normal" +) + +(TClr.130 + Name: "Transparent" +) + +(CMkSym.131 + Color: 132 + Symbols: 133 + BgColor: 148 + Size: 18.88888888888889 +) + +(TClr.132 + Red: 0xffff +) + +(SymList.133 + Child: 134 + Child: 141 +) + +(BMkSym.134 + Color: 135 + BgColor: 136 + Font: 137 + Size: 18.88888888888889 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.135 + Red: 0xffff +) + +(TClr.136 + Name: "Transparent" +) + +(NFont.137 + Family: 138 + Name: 139 + Style: 140 + Weight: 1 + Wideness: 1 +) + +(AVStr.138 + S: "ESRI Geometric Symbols" +) + +(AVStr.139 + S: "ESRI Geometric Symbols" +) + +(AVStr.140 + S: "Normal" +) + +(BMkSym.141 + Color: 142 + ColorLock: 1 + BgColor: 143 + Font: 144 + Size: 18.88888888888889 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.142 +) + +(TClr.143 + Name: "Transparent" +) + +(NFont.144 + Family: 145 + Name: 146 + Style: 147 + Weight: 1 + Wideness: 1 +) + +(AVStr.145 + S: "ESRI Geometric Symbols" +) + +(AVStr.146 + S: "ESRI Geometric Symbols" +) + +(AVStr.147 + S: "Normal" +) + +(TClr.148 + Name: "Transparent" +) + +(CMkSym.149 + Color: 150 + Symbols: 151 + BgColor: 166 + Size: 21.44444444444444 +) + +(TClr.150 + Red: 0xffff +) + +(SymList.151 + Child: 152 + Child: 159 +) + +(BMkSym.152 + Color: 153 + BgColor: 154 + Font: 155 + Size: 21.44444444444444 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.153 + Red: 0xffff +) + +(TClr.154 + Name: "Transparent" +) + +(NFont.155 + Family: 156 + Name: 157 + Style: 158 + Weight: 1 + Wideness: 1 +) + +(AVStr.156 + S: "ESRI Geometric Symbols" +) + +(AVStr.157 + S: "ESRI Geometric Symbols" +) + +(AVStr.158 + S: "Normal" +) + +(BMkSym.159 + Color: 160 + ColorLock: 1 + BgColor: 161 + Font: 162 + Size: 21.44444444444444 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.160 +) + +(TClr.161 + Name: "Transparent" +) + +(NFont.162 + Family: 163 + Name: 164 + Style: 165 + Weight: 1 + Wideness: 1 +) + +(AVStr.163 + S: "ESRI Geometric Symbols" +) + +(AVStr.164 + S: "ESRI Geometric Symbols" +) + +(AVStr.165 + S: "Normal" +) + +(TClr.166 + Name: "Transparent" +) + +(CMkSym.167 + Color: 168 + Symbols: 169 + BgColor: 184 + Size: 24.00000000000000 +) + +(TClr.168 + Red: 0xffff +) + +(SymList.169 + Child: 170 + Child: 177 +) + +(BMkSym.170 + Color: 171 + BgColor: 172 + Font: 173 + Size: 24.00000000000000 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.171 + Red: 0xffff +) + +(TClr.172 + Name: "Transparent" +) + +(NFont.173 + Family: 174 + Name: 175 + Style: 176 + Weight: 1 + Wideness: 1 +) + +(AVStr.174 + S: "ESRI Geometric Symbols" +) + +(AVStr.175 + S: "ESRI Geometric Symbols" +) + +(AVStr.176 + S: "Normal" +) + +(BMkSym.177 + Color: 178 + ColorLock: 1 + BgColor: 179 + Font: 180 + Size: 24.00000000000000 + Pattern: 83 + Angle: 360.00000000000000 +) + +(TClr.178 +) + +(TClr.179 + Name: "Transparent" +) + +(NFont.180 + Family: 181 + Name: 182 + Style: 183 + Weight: 1 + Wideness: 1 +) + +(AVStr.181 + S: "ESRI Geometric Symbols" +) + +(AVStr.182 + S: "ESRI Geometric Symbols" +) + +(AVStr.183 + S: "Normal" +) + +(TClr.184 + Name: "Transparent" +) + +(BMkSym.185 + Color: 186 + BgColor: 187 + Font: 188 + Size: 8.00000000000000 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.186 + Name: "Transparent" +) + +(TClr.187 + Name: "Transparent" +) + +(NFont.188 + Family: 189 + Name: 190 + Style: 191 + Weight: 1 + Wideness: 1 +) + +(AVStr.189 + S: "ESRI Geometric Symbols" +) + +(AVStr.190 + S: "ESRI Geometric Symbols" +) + +(AVStr.191 + S: "Normal" +) + +(LClass.192 + Label: "1 - 3" + MinNum: 1.00000000000000 + MaxNum: 3.00000000000000 +) + +(LClass.193 + Label: "4 - 15" + MinNum: 4.00000000000000 + MaxNum: 15.00000000000000 +) + +(LClass.194 + Label: "16 - 30" + MinNum: 16.00000000000000 + MaxNum: 30.00000000000000 +) + +(LClass.195 + Label: "31 - 70" + MinNum: 31.00000000000000 + MaxNum: 70.00000000000000 +) + +(LClass.196 + Label: "71 - 120" + MinNum: 71.00000000000000 + MaxNum: 120.00000000000000 +) + +(LClass.197 + Label: "121 - 188" + MinNum: 121.00000000000000 + MaxNum: 188.00000000000000 +) + +(LClass.198 + Label: "189 - 313" + MinNum: 189.00000000000000 + MaxNum: 313.00000000000000 +) + +(LClass.199 + Label: "314 - 550" + MinNum: 314.00000000000000 + MaxNum: 550.00000000000000 +) + +(LClass.200 + Label: "551 - 1016" + MinNum: 551.00000000000000 + MaxNum: 1016.00000000000000 +) + +(LClass.201 + Label: "1017 - 2286" + MinNum: 1017.00000000000000 + MaxNum: 2286.00000000000000 +) + +(LClass.202 + IsNoData: 1 + Label: "Pas de donn�es" + MaxNum: -1.00000000000000 + Precision: -3 +) + +(BMkSym.203 + Color: 204 + BgColor: 205 + Font: 206 + Size: 8.00000000000000 + Pattern: 35 + Angle: 360.00000000000000 +) + +(TClr.204 + Name: "Transparent" +) + +(TClr.205 + Name: "Transparent" +) + +(NFont.206 + Family: 207 + Name: 208 + Style: 209 + Weight: 1 + Wideness: 1 +) + +(AVStr.207 + S: "ESRI Geometric Symbols" +) + +(AVStr.208 + S: "ESRI Geometric Symbols" +) + +(AVStr.209 + S: "Normal" +) + +(NameDict.210 +) + +(NameDict.211 +) + diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.dbf b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.dbf new file mode 100644 index 0000000..b4adaf5 Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.dbf differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.qix b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.qix new file mode 100644 index 0000000..bcc41b9 Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.qix differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shp b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shp new file mode 100644 index 0000000..76c00a1 Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shp differ diff --git a/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shx b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shx new file mode 100644 index 0000000..151eb84 Binary files /dev/null and b/echobase-services/src/main/resources/gis/lizmap/resources/pelgas09.shx differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 26be897ee9aea6bb4739a377a267f51225b66575 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 17 08:21:43 2014 +0100 refs #6271 code review --- .../services/service/spatial/GisService.java | 180 +++++++++++++-------- 1 file changed, 116 insertions(+), 64 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 12e5495..a152794 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.spatial; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; +import com.google.common.io.Files; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.config.EchoBaseConfiguration; import fr.ifremer.echobase.entities.WorkingDbConfiguration; @@ -36,6 +37,7 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalINIConfiguration; import org.apache.commons.configuration.SubnodeConfiguration; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,8 +45,6 @@ import org.apache.commons.logging.LogFactory; import javax.inject.Inject; import java.io.BufferedWriter; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileWriter; import java.io.IOException; import java.net.URL; import java.sql.Connection; @@ -66,13 +66,17 @@ public class GisService extends EchoBaseServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(GisService.class); - public static final String[] TEMPLATE_MARKUP = {"{{dbname}}", "{{host}}", "{{port}}", "{{userName}}", "{{password}}", "{{voyageName}}", "{{voyageId}}", "{{resourcesPath}}"}; + private static final String[] TEMPLATE_MARKUP = {"{{dbname}}", "{{host}}", "{{port}}", "{{userName}}", "{{password}}", "{{voyageName}}", "{{voyageId}}", "{{resourcesPath}}"}; private static final String START_JDBC_URL = "jdbc:postgresql://"; private static final String GIS_INTERNAL_PATH = "/gis/templates/"; - private static final String QGIS_RESOURCES = "/lizmap/resources/"; + private static final String QGIS_RESOURCES = "/gis/lizmap/resources/"; + + private static final String[] TO_REPLACE = new String[]{"-", "."}; + + private static final String[] REPLACEMENT_LIST = new String[]{"", ""}; @Inject private WorkingDbConfigurationService workingDbConfigurationService; @@ -146,17 +150,21 @@ public class GisService extends EchoBaseServiceSupport { String repositoryName = getRepositoryName(conf); - File repository = new File(lizmapTarget, repositoryName); - EchoBaseIOUtil.forceMkdir(repository); + if (log.isInfoEnabled()) { + log.info("Lizmap repository name: " + repositoryName); + } + + File repositoryDirectory = new File(lizmapTarget, repositoryName); + EchoBaseIOUtil.forceMkdir(repositoryDirectory); // Add repository in Lizmap config - updateLizmapConfigFile(conf, repositoryName, repository); + updateLizmapConfigFile(conf, repositoryName, repositoryDirectory); // Add authorization in Lizmap database updateLizmapAuthorizations(repositoryName); for (Voyage voyage : persistenceService.getAllVoyages()) { - generateMap(conf, voyage, repository); + generateMap(conf, voyage, repositoryDirectory); } } @@ -174,15 +182,24 @@ public class GisService extends EchoBaseServiceSupport { WorkingDbConfiguration workingDbConfiguration = workingDbConfigurationService.getWorkingDbConfigurationByUrl(conf.getUrl()); - File lizmapConfig = getConfiguration().getLizmapConfigFile(); + File lizmapConfigFile = getConfiguration().getLizmapConfigFile(); try { - HierarchicalINIConfiguration lizmapIni = new HierarchicalINIConfiguration(lizmapConfig); + HierarchicalINIConfiguration lizmapIni = new HierarchicalINIConfiguration(lizmapConfigFile); + SubnodeConfiguration section = lizmapIni.getSection("repository:" + repositoryName); section.setProperty("label", workingDbConfiguration.getDescription()); section.setProperty("path", repository.getAbsolutePath() + "/"); - lizmapIni.save(new FileWriter(lizmapConfig)); + + BufferedWriter writer = Files.newWriter(lizmapConfigFile, Charsets.UTF_8); + try { + lizmapIni.save(writer); + writer.close(); + } finally { + + IOUtils.closeQuietly(writer); + } } catch (ConfigurationException e) { throw new EchoBaseTechnicalException("Could not load Lizmap config", e); @@ -196,40 +213,66 @@ public class GisService extends EchoBaseServiceSupport { String lizmapJdbcUrl = getConfiguration().getLizmapJdbcUrl(); Connection connection = null; - Statement statement = null; try { connection = DriverManager.getConnection(lizmapJdbcUrl); - statement = connection.createStatement(); - statement.execute("INSERT OR REPLACE INTO jacl2_rights " + - "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + - "VALUES " + - "('lizmap.repositories.view', '__anonymous', '" + repositoryName + "', 0);"); - statement.execute("INSERT OR REPLACE INTO jacl2_rights " + - "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + - "VALUES " + - "('lizmap.repositories.view', 'admins', '" + repositoryName + "', 0);"); + + executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + + "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + + "VALUES " + + "('lizmap.repositories.view', '__anonymous', '" + repositoryName + "', 0);"); + + executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + + "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + + "VALUES " + + "('lizmap.repositories.view', 'admins', '" + repositoryName + "', 0);"); + + connection.commit(); + + connection.close(); } catch (SQLException e) { throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); } finally { try { - if (statement != null) { - statement.close(); - } - if (connection != null) { + if (connection != null && !connection.isClosed()) { connection.close(); } } catch (SQLException e) { + //FIXME We should never throw an exception in finally block throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); } } } + protected void executeQuery(Connection connection, String query) throws SQLException { + + if (log.isInfoEnabled()) { + log.info("Execute sql query to lizmap: " + query); + } + + Statement statement = connection.createStatement(); + + try { + statement.execute(query); + + statement.close(); + + } finally { + + if (statement != null) { + statement.close(); + } + + } + + } + protected String getRepositoryName(JdbcConfiguration conf) { String url = conf.getUrl(); + //TODO Use a regex int hostIndex = START_JDBC_URL.length() - 1; int portIndex = url.indexOf(':', hostIndex); int dbnameIndex = url.indexOf("/", portIndex); @@ -238,9 +281,9 @@ public class GisService extends EchoBaseServiceSupport { String host = url.substring(hostIndex + 1, portIndex); String port = url.substring(portIndex + 1, dbnameIndex); - String repository = host + port + dbname; + String repository = getConfiguration().getLizmapRepositoryName() + host + port + dbname; - repository = StringUtils.replaceEach(repository, new String[]{"-", "."}, new String[]{"", ""}); + repository = StringUtils.replaceEach(repository, TO_REPLACE, REPLACEMENT_LIST); return repository; } @@ -248,73 +291,81 @@ public class GisService extends EchoBaseServiceSupport { /** * Generate map files for this database and this voyage. * - * @param conf data base connexion configuration - * @param voyage voyage for this map - * @param repository Lizmap repository + * @param conf data base connexion configuration + * @param voyage voyage for this map + * @param repositoryDirectory Lizmap repository * @return Name of project map */ - protected String generateMap(JdbcConfiguration conf, Voyage voyage, File repository) { + protected String generateMap(JdbcConfiguration conf, Voyage voyage, File repositoryDirectory) { + Preconditions.checkNotNull(conf); Preconditions.checkNotNull(voyage); - String project = voyage.getName(); + String voyageName = voyage.getName(); String[] templateValues = getTemplateValues(conf, voyage); - generateMapFile(getConfiguration().getQgisTemplateFile(), repository, project, templateValues); + generateFileFromTemplate(getConfiguration().getQgisTemplateFile(), repositoryDirectory, voyageName, templateValues); - generateMapFile(getConfiguration().getLizmapTemplateFile(), repository, project, templateValues); + generateFileFromTemplate(getConfiguration().getLizmapTemplateFile(), repositoryDirectory, voyageName, templateValues); - return project; + return voyageName; } /** * Generate file from template and values * - * @param template file template to used - * @param repository lizmap repository - * @param project project name - * @param templateValues values to used in the template + * @param templateFile file template to used + * @param repositoryDirectory lizmap repository + * @param voyageName project name + * @param templateValues values to used in the template * @return file generated */ - public File generateMapFile(File template, File repository, String project, String[] templateValues) { + public File generateFileFromTemplate(File templateFile, File repositoryDirectory, String voyageName, String... templateValues) { - String name = template.getName(); - name = project + name.substring(name.indexOf(".")); + String fileName = voyageName + "." + Files.getFileExtension(templateFile.getAbsolutePath()); + File target = new File(repositoryDirectory, fileName); - File target = new File(repository, name); + if (!target.exists()) { - if (!target.isFile()) { + if (log.isInfoEnabled()) { + log.info("Generate file: " + target); + } - Scanner scanner = null; - BufferedWriter bufferedWriter = null; try { - scanner = new Scanner(template, Charsets.UTF_8.name()); - bufferedWriter = new BufferedWriter(new FileWriter(target)); + Scanner scanner = new Scanner(templateFile, Charsets.UTF_8.name()); - String line; + try { + + BufferedWriter bufferedWriter = Files.newWriter(target, Charsets.UTF_8); - while (scanner.hasNextLine()) { - line = scanner.nextLine(); - line = StringUtils.replaceEach(line, TEMPLATE_MARKUP, templateValues); - bufferedWriter.write(line); - bufferedWriter.newLine(); - } - } catch (FileNotFoundException e) { - throw new EchoBaseTechnicalException(e); - } catch (IOException e) { - throw new EchoBaseTechnicalException(e); - } finally { - scanner.close(); - if (bufferedWriter != null) { try { + + while (scanner.hasNextLine()) { + + String line = scanner.nextLine(); + line = StringUtils.replaceEach(line, TEMPLATE_MARKUP, templateValues); + bufferedWriter.write(line); + bufferedWriter.newLine(); + + } + bufferedWriter.close(); - } catch (IOException e) { - throw new EchoBaseTechnicalException(e); + + } finally { + IOUtils.closeQuietly(bufferedWriter); } + + scanner.close(); + + } finally { + IOUtils.closeQuietly(scanner); } + + } catch (IOException e) { + throw new EchoBaseTechnicalException(e); } } @@ -338,6 +389,7 @@ public class GisService extends EchoBaseServiceSupport { throw new EchoBaseTechnicalException("JDBC URL '" + url + "' is no reference to a Postrges database"); } + //TODO Use a regex int hostIndex = START_JDBC_URL.length() - 1; int portIndex = url.indexOf(':', hostIndex); int dbnameIndex = url.indexOf("/", portIndex); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.