Skip to content
Permalink
Browse files

resolved conflicts

  • Loading branch information
Samweli committed Dec 21, 2019
2 parents 93537d3 + 59c777f commit 965cb1344e8b60cb5a739f84d5325c23c218558a
Showing with 9,345 additions and 2,211 deletions.
  1. +9 −0 images/images.qrc
  2. +189 −0 images/themes/default/mesh/Depth.svg
  3. +184 −0 images/themes/default/mesh/Elevation.svg
  4. +194 −0 images/themes/default/mesh/Height.svg
  5. +204 −0 images/themes/default/mesh/MultiBottom.svg
  6. +179 −0 images/themes/default/mesh/MultiTop.svg
  7. +184 −0 images/themes/default/mesh/Sigma.svg
  8. +199 −0 images/themes/default/mesh/SingleBottom.svg
  9. +184 −0 images/themes/default/mesh/SingleTop.svg
  10. +31 −0 images/themes/default/propertyicons/relations.svg
  11. +1 −0 linux/org.qgis.qgis.appdata.xml.in
  12. +3 −0 python/core/auto_generated/fieldformatter/qgsrelationreferencefieldformatter.sip.in
  13. +3 −0 python/core/auto_generated/fieldformatter/qgsvaluemapfieldformatter.sip.in
  14. +3 −0 python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in
  15. +250 −15 python/core/auto_generated/mesh/qgsmesh3daveraging.sip.in
  16. +124 −0 python/core/auto_generated/processing/qgsprocessingparameters.sip.in
  17. +10 −0 python/core/auto_generated/processing/qgsprocessingutils.sip.in
  18. +185 −53 python/core/auto_generated/qgscoordinatereferencesystem.sip.in
  19. +64 −1 python/core/auto_generated/qgsfieldformatter.sip.in
  20. +1 −0 python/core/auto_generated/qgsmaplayer.sip.in
  21. +1 −1 python/core/auto_generated/qgsrelationmanager.sip.in
  22. +1 −0 python/core/auto_generated/qgssettings.sip.in
  23. +2 −0 python/core/auto_generated/qgsvectorlayer.sip.in
  24. +153 −0 python/gui/auto_generated/qgscoordinateoperationwidget.sip.in
  25. +35 −16 python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in
  26. +1 −0 python/gui/gui_auto.sip
  27. +1 −1 python/plugins/db_manager/db_plugins/postgis/connector.py
  28. +1 −1 python/plugins/processing/algs/gdal/GdalUtils.py
  29. +2 −2 python/plugins/processing/algs/grass7/Grass7Algorithm.py
  30. +2 −2 python/plugins/processing/algs/grass7/ext/r_proj.py
  31. +2 −2 python/plugins/processing/algs/grass7/ext/v_proj.py
  32. +1 −1 python/plugins/processing/algs/qgis/HypsometricCurves.py
  33. +10 −6 python/plugins/processing/modeler/ModelerScene.py
  34. +2 −2 python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py
  35. +5 −0 resources/function_help/json/UserGroup
  36. +2 −0 src/analysis/mesh/qgsmeshcalcutils.cpp
  37. +9 −3 src/analysis/mesh/qgsmeshcontours.cpp
  38. +1 −1 src/analysis/processing/qgsalgorithmimportphotos.cpp
  39. +1 −1 src/analysis/processing/qgsalgorithmrasterize.cpp
  40. +1 −1 src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp
  41. +11 −1 src/analysis/processing/qgsalgorithmtransform.cpp
  42. +1 −0 src/analysis/processing/qgsalgorithmtransform.h
  43. +1 −1 src/analysis/raster/qgsalignraster.cpp
  44. +2 −2 src/analysis/raster/qgsrastercalculator.cpp
  45. +4 −2 src/app/dwg/qgsdwgimportdialog.cpp
  46. +1 −1 src/app/dwg/qgsdwgimporter.cpp
  47. +221 −13 src/app/mesh/qgsmeshrenderer3daveragingwidget.cpp
  48. +121 −23 src/app/qgisapp.cpp
  49. +21 −5 src/app/qgisapp.h
  50. +2 −2 src/app/qgsalignrasterdialog.cpp
  51. +14 −30 src/app/qgsappcoordinateoperationhandlers.cpp
  52. +73 −44 src/app/qgscustomprojectiondialog.cpp
  53. +1 −7 src/app/qgscustomprojectiondialog.h
  54. +41 −44 src/app/qgsdatumtransformtablewidget.cpp
  55. +1 −1 src/app/qgsdatumtransformtablewidget.h
  56. +1 −1 src/app/qgsfieldcalculator.cpp
  57. +25 −14 src/app/qgsmaplayerstylecategoriesmodel.cpp
  58. +4 −4 src/app/qgsmeasuredialog.cpp
  59. +2 −2 src/app/qgsnewspatialitelayerdialog.cpp
  60. +2 −2 src/app/qgsprojectproperties.cpp
  61. +2 −2 src/app/qgsrasterlayerproperties.cpp
  62. +1 −1 src/app/qgsrecentprojectsitemsmodel.cpp
  63. +2 −2 src/app/qgstemplateprojectsmodel.cpp
  64. +2 −0 src/core/CMakeLists.txt
  65. +1 −0 src/core/expression/qgsexpression.cpp
  66. +3 −3 src/core/expression/qgsexpressioncontextutils.cpp
  67. +1 −1 src/core/expression/qgsexpressionfunction.cpp
  68. +20 −0 src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
  69. +3 −1 src/core/fieldformatter/qgsrelationreferencefieldformatter.h
  70. +21 −0 src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
  71. +3 −1 src/core/fieldformatter/qgsvaluemapfieldformatter.h
  72. +21 −0 src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
  73. +3 −1 src/core/fieldformatter/qgsvaluerelationfieldformatter.h
  74. +1 −1 src/core/layout/qgslayoutexporter.cpp
  75. +3 −3 src/core/layout/qgslayoutitemmap.cpp
  76. +495 −60 src/core/mesh/qgsmesh3daveraging.cpp
  77. +265 −16 src/core/mesh/qgsmesh3daveraging.h
  78. +2 −0 src/core/mesh/qgsmeshlayerinterpolator.cpp
  79. +13 −3 src/core/mesh/qgsmeshlayerrenderer.cpp
  80. +1 −1 src/core/mesh/qgsmeshrenderersettings.cpp
  81. +2 −4 src/core/metadata/qgslayermetadataformatter.cpp
  82. +123 −57 src/core/processing/qgsprocessingparameters.cpp
  83. +106 −0 src/core/processing/qgsprocessingparameters.h
  84. +52 −0 src/core/processing/qgsprocessingparametertypeimpl.h
  85. +3 −0 src/core/processing/qgsprocessingregistry.cpp
  86. +61 −0 src/core/processing/qgsprocessingutils.cpp
  87. +10 −0 src/core/processing/qgsprocessingutils.h
  88. +1 −1 src/core/providers/gdal/qgsgdaldataitems.cpp
  89. +1 −1 src/core/providers/gdal/qgsgdalprovider.cpp
  90. +1 −9 src/core/providers/memory/qgsmemoryprovider.cpp
  91. +5 −1 src/core/providers/ogr/qgsogrprovider.cpp
  92. +6 −0 src/core/qgis.h
  93. +306 −192 src/core/qgscoordinatereferencesystem.cpp
  94. +179 −70 src/core/qgscoordinatereferencesystem.h
  95. +0 −2 src/core/qgscoordinatereferencesystem_p.h
  96. +6 −6 src/core/qgscoordinatetransform.cpp
  97. +5 −5 src/core/qgscoordinatetransform_p.cpp
  98. +1 −1 src/core/qgscoordinateutils.cpp
  99. +3 −3 src/core/qgsdistancearea.cpp
  100. +9 −8 src/core/qgsellipsoidutils.cpp
  101. +14 −0 src/core/qgsfieldformatter.cpp
  102. +65 −0 src/core/qgsfieldformatter.h
  103. +2 −2 src/core/qgsgdalutils.cpp
  104. +1 −1 src/core/qgsjsonutils.cpp
  105. +9 −10 src/core/qgsmaplayer.cpp
  106. +2 −1 src/core/qgsmaplayer.h
  107. +6 −2 src/core/qgsmaprendererjob.cpp
  108. +2 −2 src/core/qgsmaprenderertask.cpp
  109. +1 −1 src/core/qgsofflineediting.cpp
  110. +10 −4 src/core/qgsproject.cpp
  111. +17 −3 src/core/qgsprojutils.cpp
  112. +10 −1 src/core/qgsprojutils.h
  113. +4 −1 src/core/qgsrelationmanager.cpp
  114. +1 −1 src/core/qgsrelationmanager.h
  115. +3 −1 src/core/qgssettings.cpp
  116. +1 −0 src/core/qgssettings.h
  117. +1 −1 src/core/qgsvectorfilewriter.cpp
  118. +149 −2 src/core/qgsvectorlayer.cpp
  119. +12 −0 src/core/qgsvectorlayer.h
  120. +75 −0 src/core/qgsweakrelation.cpp
  121. +101 −0 src/core/qgsweakrelation.h
  122. +2 −3 src/core/raster/qgsrasterlayer.cpp
  123. +2 −0 src/gui/CMakeLists.txt
  124. +1 −1 src/gui/attributetable/qgsdualview.cpp
  125. +1 −0 src/gui/processing/qgsprocessingguiregistry.cpp
  126. +343 −13 src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
  127. +73 −0 src/gui/processing/qgsprocessingwidgetwrapperimpl.h
  128. +1 −1 src/gui/qgscoordinateboundspreviewmapwidget.cpp
  129. +784 −0 src/gui/qgscoordinateoperationwidget.cpp
  130. +192 −0 src/gui/qgscoordinateoperationwidget.h
  131. +38 −627 src/gui/qgsdatumtransformdialog.cpp
  132. +3 −20 src/gui/qgsdatumtransformdialog.h
  133. +1 −1 src/gui/qgsexpressionbuilderdialog.cpp
  134. +85 −27 src/gui/qgsexpressionbuilderwidget.cpp
  135. +38 −17 src/gui/qgsexpressionbuilderwidget.h
  136. +0 −3 src/gui/qgsexpressionselectiondialog.cpp
  137. +1 −1 src/gui/qgsmaptooldigitizefeature.h
  138. +1 −1 src/gui/qgsmetadatawidget.cpp
  139. +1 −1 src/gui/qgsnewgeopackagelayerdialog.cpp
  140. +2 −2 src/gui/qgsowssourceselect.cpp
  141. +7 −37 src/gui/qgsprojectionselectiontreewidget.cpp
  142. +3 −4 src/gui/qgsprojectionselectiontreewidget.h
  143. +26 −24 src/gui/qgsprojectionselectionwidget.cpp
  144. +1 −0 src/gui/qgsprojectionselectionwidget.h
  145. +1 −1 src/plugins/coordinate_capture/coordinatecapture.cpp
  146. +2 −2 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  147. +1 −1 src/plugins/georeferencer/qgsimagewarper.cpp
  148. +1 −1 src/plugins/grass/qgsgrassmodule.cpp
  149. +1 −1 src/plugins/grass/qgsgrassnewmapset.cpp
  150. +2 −8 src/providers/db2/qgsdb2provider.cpp
  151. +1 −1 src/providers/gpx/qgsgpxprovider.cpp
  152. +5 −5 src/providers/grass/qgsgrassgislib.cpp
  153. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  154. +4 −2 src/providers/postgres/qgspostgresprovider.cpp
  155. +1 −15 src/providers/spatialite/qgsspatialiteprovider.cpp
  156. +2 −0 src/providers/virtual/qgsvirtuallayerprovider.cpp
  157. +4 −0 src/providers/virtual/qgsvirtuallayersourceselect.cpp
  158. +1 −1 src/providers/wcs/qgswcscapabilities.cpp
  159. +2 −2 src/providers/wcs/qgswcsprovider.cpp
  160. +1 −1 src/providers/wms/qgswmsprovider.cpp
  161. +2 −2 src/providers/wms/qgswmssourceselect.cpp
  162. +16 −15 src/server/qgsserver.cpp
  163. +0 −2 src/server/qgsserver.h
  164. +2 −2 src/server/qgsserverapiutils.cpp
  165. +2 −2 src/server/services/wfs/qgswfsgetfeature.cpp
  166. +785 −5 src/ui/mesh/qgsmeshrenderer3daveragingwidgetbase.ui
  167. +161 −0 src/ui/qgscoordinateoperationwidgetbase.ui
  168. +47 −163 src/ui/qgsdatumtransformdialogbase.ui
  169. +27 −17 src/ui/qgsexpressionbuilder.ui
  170. +2 −2 tests/src/analysis/testqgsalignraster.cpp
  171. +130 −0 tests/src/analysis/testqgsprocessing.cpp
  172. +1 −1 tests/src/analysis/testqgsprocessingalgs.cpp
  173. +4 −8 tests/src/analysis/testqgsrastercalculator.cpp
  174. +1 −1 tests/src/analysis/testqgsreclassifyutils.cpp
  175. +2 −3 tests/src/app/testqgisappclipboard.cpp
  176. +3 −3 tests/src/app/testqgsattributetable.cpp
  177. +2 −2 tests/src/app/testqgsfieldcalculator.cpp
  178. +5 −5 tests/src/app/testqgsmaptoolidentifyaction.cpp
  179. +1 −1 tests/src/app/testqgsmaptoolreshape.cpp
  180. +6 −6 tests/src/app/testqgsmeasuretool.cpp
  181. +2 −0 tests/src/core/CMakeLists.txt
  182. +343 −175 tests/src/core/testqgscoordinatereferencesystem.cpp
  183. +22 −34 tests/src/core/testqgscoordinatetransform.cpp
  184. +11 −9 tests/src/core/testqgsdistancearea.cpp
  185. +13 −0 tests/src/core/testqgsgdalutils.cpp
  186. +12 −24 tests/src/core/testqgsgeometry.cpp
  187. +1 −3 tests/src/core/testqgslayoutatlas.cpp
  188. +29 −31 tests/src/core/testqgslayoutmapgrid.cpp
  189. +1 −2 tests/src/core/testqgslayoutscalebar.cpp
  190. +31 −0 tests/src/core/testqgsmaprendererjob.cpp
  191. +332 −0 tests/src/core/testqgsmesh3daveraging.cpp
  192. +54 −2 tests/src/core/testqgsmeshlayerrenderer.cpp
  193. +3 −9 tests/src/core/testqgsvectorfilewriter.cpp
  194. +106 −0 tests/src/core/testqgsweakrelation.cpp
  195. +114 −0 tests/src/gui/testprocessinggui.cpp
  196. +2 −4 tests/src/gui/testprojectionissues.cpp
  197. +1 −0 tests/src/python/CMakeLists.txt
  198. +1 −2 tests/src/python/qgis_local_server.py
  199. +152 −0 tests/src/python/test_qgscoordinateoperationwidget.py
  200. +4 −8 tests/src/python/test_qgscoordinatetransform.py
  201. +3 −3 tests/src/python/test_qgsdistancearea.py
  202. +5 −5 tests/src/python/test_qgsellipsoidutils.py
  203. +3 −3 tests/src/python/test_qgsexpressionbuilderwidget.py
  204. +1 −2 tests/src/python/test_qgslayoutatlas.py
  205. +1 −2 tests/src/python/test_qgslayoutexporter.py
  206. +1 −3 tests/src/python/test_qgspallabeling_base.py
  207. +1 −3 tests/src/python/test_qgsprojectbadlayers.py
  208. +1 −1 tests/src/python/test_qgssymbol.py
  209. +10 −20 tests/src/python/test_qgsvectorfilewriter.py
  210. +1 −2 tests/src/python/test_selective_masking.py
  211. +1 −2 tests/src/python/utilities.py
  212. BIN ...expected_vector_layer_bounds_with_reprojection/expected_vector_layer_bounds_with_reprojection.png
  213. BIN ...pected_stacked_3d_mesh_single_level_averaging/expected_stacked_3d_mesh_single_level_averaging.png
  214. +36 −0 tests/testdata/grid_4326.geojson
  215. BIN tests/testdata/mesh/trap_steady_05_3D.nc
@@ -591,6 +591,7 @@
<file>themes/default/propertyicons/system.svg</file>
<file>themes/default/propertyicons/transparency.svg</file>
<file>themes/default/propertyicons/spacer.svg</file>
<file>themes/default/propertyicons/relations.svg</file>
<file>themes/default/rendererCategorizedSymbol.svg</file>
<file>themes/default/rendererGraduatedSymbol.svg</file>
<file>themes/default/rendererNullSymbol.svg</file>
@@ -697,6 +698,14 @@
<file>themes/default/processingAlgorithm.svg</file>
<file>themes/default/processingResult.svg</file>
<file>themes/default/search.svg</file>
<file>themes/default/mesh/Depth.svg</file>
<file>themes/default/mesh/Elevation.svg</file>
<file>themes/default/mesh/Height.svg</file>
<file>themes/default/mesh/MultiBottom.svg</file>
<file>themes/default/mesh/MultiTop.svg</file>
<file>themes/default/mesh/Sigma.svg</file>
<file>themes/default/mesh/SingleTop.svg</file>
<file>themes/default/mesh/SingleBottom.svg</file>
<file>themes/default/mActionNew3DMap.svg</file>
<file>themes/default/mActionNewMap.svg</file>
<file>themes/default/mActionNext.svg</file>
@@ -0,0 +1,189 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
sodipodi:docname="Depth.svg"
id="svg3391"
version="1.1"
viewBox="0 0 172.05501 141.061"
height="141.061mm"
width="172.05501mm">
<metadata
id="metadata3397">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3395" />
<sodipodi:namedview
inkscape:current-layer="svg3391"
inkscape:window-maximized="0"
inkscape:window-y="23"
inkscape:window-x="0"
inkscape:cy="413.2611"
inkscape:cx="-48.433273"
inkscape:zoom="0.27972783"
fit-margin-bottom="0"
fit-margin-right="0"
fit-margin-left="0"
fit-margin-top="0"
showgrid="false"
id="namedview3393"
inkscape:window-height="1046"
inkscape:window-width="1713"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
inkscape:document-rotation="0"
bordercolor="#666666"
pagecolor="#ffffff" />
<path
inkscape:connector-curvature="0"
id="path3345"
d="M 0,0 H 172.055 V 141.061 H 0 Z"
fill="#fff" />
<path
inkscape:connector-curvature="0"
id="path3347"
fill="#00fa00"
d="M 27.792,22.872 46.128,22.671 45.811,40.066 Z M 84.29,21.942 83.687,40.217 45.811,40.066 46.128,22.671 Z" />
<path
inkscape:connector-curvature="0"
id="path3349"
fill="#00fa00"
d="m 84.29,21.942 -0.603,18.275 44.402,-0.141 0.025,-17.93 z" />
<path
inkscape:connector-curvature="0"
id="path3351"
fill="#00fa00"
d="m 157.794,21.953 -7.51,18.113 -22.195,0.01 0.025,-17.93 z m -111.983,18.113 20.778,23.337 16.899,0.106 0.2,-23.292 z" />
<path
inkscape:connector-curvature="0"
id="path3353"
fill="#00fa00"
d="m 128.079,63.817 -44.591,-0.308 0.2,-23.292 44.401,-0.141 z" />
<path
inkscape:connector-curvature="0"
id="path3355"
fill="#00fa00"
d="m 128.089,40.076 22.195,-0.01 -7.421,23.401 -14.784,0.35 z" />
<path
inkscape:connector-curvature="0"
id="path3357"
fill="none"
d="m 71.966,71.362 11.737,-0.11 -0.094,17.497 z m 56.113,-0.232 -0.02,31.226 11.792,-31.145 z m -44.47,17.619 0.094,-17.496 44.376,-0.123 -0.02,31.226 -36.135,0.151 z" />
<path
inkscape:connector-curvature="0"
id="path3359"
fill="none"
d="m 91.924,102.507 36.135,-0.15 -4.838,13.909 -6.804,14.665 -3.629,2.57 -3.78,-2.72 -7.559,-12.247 z" />
<g
transform="translate(-20.864,-39.158)"
id="g3371"
stroke="#000"
fill="none">
<path
inkscape:connector-curvature="0"
id="path3361"
stroke-width=".265"
d="m 148.923,141.514 0.055,-94.191" />
<path
inkscape:connector-curvature="0"
id="path3363"
stroke-width=".268"
d="M 171.148,79.224 29.633,79.526" />
<path
inkscape:connector-curvature="0"
id="path3365"
stroke-width=".265"
d="m 104.473,127.907 0.036,-81.004 M 66.675,79.224 v 0 l 0.101,-32.238" />
<path
inkscape:connector-curvature="0"
id="path3367"
stroke-width=".273"
d="M 160.715,110.369 H 29.331" />
<path
inkscape:connector-curvature="0"
id="path3369"
stroke-width=".277"
d="M 148.923,141.514 30.087,141.816" />
</g>
<g
transform="translate(-20.864,-39.158)"
id="g3389">
<path
inkscape:connector-curvature="0"
id="path3373"
stroke-linejoin="bevel"
stroke-linecap="round"
stroke-width="2.3"
stroke="#820300"
fill="#50166a"
overflow="visible"
font-family="sans-serif"
font-weight="400"
color="#000"
d="m 30.318,46.764 -0.162,0.209 c 22.724,17.605 39.94,35.416 53.207,51.887 16.759,20.806 27.22,39.476 34.533,52.907 3.657,6.715 6.527,12.12 9.008,15.834 1.24,1.856 2.383,3.29 3.487,4.255 1.103,0.966 2.178,1.466 3.261,1.42 1.084,-0.045 2.153,-0.637 3.254,-1.789 1.102,-1.152 2.243,-2.868 3.48,-5.203 2.476,-4.669 5.338,-11.808 8.985,-21.814 7.294,-20.013 17.727,-51.492 34.45,-97.557 l -0.249,-0.09 c -1.78,4.907 -3.49,9.848 -5.133,14.427 -13.777,38.418 -22.801,65.256 -29.316,83.13 -3.646,10.002 -6.506,17.134 -8.969,21.78 -1.231,2.322 -2.363,4.023 -3.437,5.146 -1.074,1.123 -2.081,1.665 -3.076,1.707 -0.995,0.042 -2,-0.416 -3.075,-1.356 -1.074,-0.94 -2.21,-2.356 -3.443,-4.203 -2.468,-3.693 -5.337,-9.098 -8.994,-15.814 C 110.814,138.206 100.343,119.518 83.57,98.694 70.29,82.207 53.06,64.381 30.318,46.763 Z"
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3375"
stroke-linecap="round"
stroke-width="2"
stroke="#0000fd"
fill="none"
d="M 183.82,46.914 30.156,46.973" />
<text
id="text3379"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="78.619003"
x="29.18"
style="line-height:1.25"><tspan
id="tspan3377"
y="78.619003"
x="29.18">-1m</tspan></text>
<text
id="text3383"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="109.462"
x="28.726"
style="line-height:1.25"><tspan
id="tspan3381"
y="109.462"
x="28.726">-2m</tspan></text>
<text
id="text3387"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="140.91"
x="29.330999"
style="line-height:1.25"><tspan
id="tspan3385"
y="140.91"
x="29.330999">-3m</tspan></text>
</g>
</svg>
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
sodipodi:docname="Elevation.svg"
id="svg2776"
version="1.1"
viewBox="0 0 172.05501 141.061"
height="141.061mm"
width="172.05501mm">
<metadata
id="metadata2782">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2780" />
<sodipodi:namedview
inkscape:current-layer="svg2776"
inkscape:window-maximized="0"
inkscape:window-y="23"
inkscape:window-x="0"
inkscape:cy="413.2611"
inkscape:cx="-48.433273"
inkscape:zoom="0.27972783"
fit-margin-bottom="0"
fit-margin-right="0"
fit-margin-left="0"
fit-margin-top="0"
showgrid="false"
id="namedview2778"
inkscape:window-height="1038"
inkscape:window-width="1637"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
inkscape:document-rotation="0"
bordercolor="#666666"
pagecolor="#ffffff" />
<path
inkscape:connector-curvature="0"
id="path2732"
d="M 0,0 H 172.055 V 141.061 H 0 Z"
fill="#fff" />
<path
inkscape:connector-curvature="0"
id="path2734"
fill="#00fa00"
d="m 25.64,20.936 20.488,0.014 -0.317,19.116 z m 57.789,-0.5 0.258,19.781 -37.876,-0.151 0.317,-19.116 z" />
<path
inkscape:connector-curvature="0"
id="path2736"
fill="#00fa00"
d="m 83.429,20.436 0.258,19.781 44.402,-0.141 0.455,-19.435 z m 74.58,-0.204 -7.725,19.834 -22.195,0.01 0.455,-19.435 z M 45.811,40.066 71.967,71.362 83.703,71.252 83.687,40.217 Z" />
<path
inkscape:connector-curvature="0"
id="path2738"
fill="#00fa00"
d="M 128.079,71.13 83.703,71.253 83.687,40.217 128.089,40.076 Z" />
<path
inkscape:connector-curvature="0"
id="path2740"
fill="#00fa00"
d="m 128.089,40.076 22.195,-0.01 -15.81,48.354 -6.395,-17.29 z m -56.123,31.286 11.737,-0.11 -0.094,17.497 z" />
<path
inkscape:connector-curvature="0"
id="path2742"
fill="#00fa00"
d="m 128.079,71.13 -0.02,17.46 6.415,-0.17 z m -44.47,17.619 0.094,-17.496 44.376,-0.123 -0.02,17.46 z" />
<path
inkscape:connector-curvature="0"
id="path2744"
fill="none"
d="m 91.924,102.507 36.135,-0.15 -4.838,13.909 -6.804,14.665 -3.629,2.57 -3.78,-2.72 -7.559,-12.247 z" />
<g
transform="translate(-20.864,-39.158)"
id="g2756"
stroke="#000"
fill="none">
<path
inkscape:connector-curvature="0"
id="path2746"
stroke-width=".265"
d="m 148.923,141.514 0.055,-94.191" />
<path
inkscape:connector-curvature="0"
id="path2748"
stroke-width=".268"
d="M 171.148,79.224 29.633,79.526" />
<path
inkscape:connector-curvature="0"
id="path2750"
stroke-width=".265"
d="m 104.473,127.907 0.036,-81.004 M 66.675,79.224 v 0 l 0.101,-32.238" />
<path
inkscape:connector-curvature="0"
id="path2752"
stroke-width=".273"
d="M 160.715,110.369 H 29.331" />
<path
inkscape:connector-curvature="0"
id="path2754"
stroke-width=".277"
d="M 148.923,141.514 30.087,141.816" />
</g>
<g
transform="translate(-20.864,-39.158)"
id="g2774">
<path
inkscape:connector-curvature="0"
id="path2758"
stroke-linejoin="bevel"
stroke-linecap="round"
stroke-width="2.3"
stroke="#820300"
fill="#50166a"
overflow="visible"
font-family="sans-serif"
font-weight="400"
color="#000"
d="m 30.318,46.764 -0.162,0.209 c 22.724,17.605 39.94,35.416 53.207,51.887 16.759,20.806 27.22,39.476 34.533,52.907 3.657,6.715 6.527,12.12 9.008,15.834 1.24,1.856 2.383,3.29 3.487,4.255 1.103,0.966 2.178,1.466 3.261,1.42 1.084,-0.045 2.153,-0.637 3.254,-1.789 1.102,-1.152 2.243,-2.868 3.48,-5.203 2.476,-4.669 5.338,-11.808 8.985,-21.814 7.294,-20.013 17.727,-51.492 34.45,-97.557 l -0.249,-0.09 c -1.78,4.907 -3.49,9.848 -5.133,14.427 -13.777,38.418 -22.801,65.256 -29.316,83.13 -3.646,10.002 -6.506,17.134 -8.969,21.78 -1.231,2.322 -2.363,4.023 -3.437,5.146 -1.074,1.123 -2.081,1.665 -3.076,1.707 -0.995,0.042 -2,-0.416 -3.075,-1.356 -1.074,-0.94 -2.21,-2.356 -3.443,-4.203 -2.468,-3.693 -5.337,-9.098 -8.994,-15.814 C 110.814,138.206 100.343,119.518 83.57,98.694 70.29,82.207 53.06,64.381 30.318,46.763 Z"
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path2760"
stroke-linecap="round"
stroke-width="2"
stroke="#0000fd"
fill="none"
d="M 183.82,46.914 30.156,46.973" />
<text
id="text2764"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="78.619003"
x="29.18"
style="line-height:1.25"><tspan
id="tspan2762"
y="78.619003"
x="29.18">-1m</tspan></text>
<text
id="text2768"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="109.462"
x="28.726"
style="line-height:1.25"><tspan
id="tspan2766"
y="109.462"
x="28.726">-2m</tspan></text>
<text
id="text2772"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="140.91"
x="29.330999"
style="line-height:1.25"><tspan
id="tspan2770"
y="140.91"
x="29.330999">-3m</tspan></text>
</g>
</svg>

0 comments on commit 965cb13

Please sign in to comment.
You can’t perform that action at this time.