@mapcomponents/react-maplibre 0.1.60 → 0.1.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (114) hide show
  1. package/.eslintignore +2 -1
  2. package/CHANGELOG.md +10 -0
  3. package/coverage/clover.xml +127 -48
  4. package/coverage/coverage-final.json +4 -3
  5. package/coverage/lcov-report/index.html +38 -23
  6. package/coverage/lcov-report/src/components/MapLibreMap/MapLibreMap.tsx.html +1 -1
  7. package/coverage/lcov-report/src/components/MapLibreMap/index.html +1 -1
  8. package/coverage/lcov-report/src/components/MlCenterPosition/MlCenterPosition.tsx.html +1 -1
  9. package/coverage/lcov-report/src/components/MlCenterPosition/index.html +1 -1
  10. package/coverage/lcov-report/src/components/MlCreatePdfButton/MlCreatePdfButton.tsx.html +1 -1
  11. package/coverage/lcov-report/src/components/MlCreatePdfButton/index.html +1 -1
  12. package/coverage/lcov-report/src/components/MlCreatePdfForm/MlCreatePdfForm.tsx.html +2 -8
  13. package/coverage/lcov-report/src/components/MlCreatePdfForm/index.html +1 -1
  14. package/coverage/lcov-report/src/components/MlFeatureEditor/MlFeatureEditor.tsx.html +1 -1
  15. package/coverage/lcov-report/src/components/MlFeatureEditor/index.html +1 -1
  16. package/coverage/lcov-report/src/components/MlFillExtrusionLayer/MlFillExtrusionLayer.tsx.html +1 -1
  17. package/coverage/lcov-report/src/components/MlFillExtrusionLayer/index.html +1 -1
  18. package/coverage/lcov-report/src/components/MlFollowGps/MlFollowGps.tsx.html +1 -1
  19. package/coverage/lcov-report/src/components/MlFollowGps/index.html +1 -1
  20. package/coverage/lcov-report/src/components/MlGPXViewer/MlGPXViewer.tsx.html +1 -1
  21. package/coverage/lcov-report/src/components/MlGPXViewer/gpxConverter.js.html +1 -1
  22. package/coverage/lcov-report/src/components/MlGPXViewer/index.html +1 -1
  23. package/coverage/lcov-report/src/components/MlGeoJsonLayer/MlGeoJsonLayer.tsx.html +1 -1
  24. package/coverage/lcov-report/src/components/MlGeoJsonLayer/index.html +1 -1
  25. package/coverage/lcov-report/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.tsx.html +1 -1
  26. package/coverage/lcov-report/src/components/MlGeojsonLayerWithSource/index.html +1 -1
  27. package/coverage/lcov-report/src/components/MlImageMarkerLayer/MlImageMarkerLayer.tsx.html +1 -1
  28. package/coverage/lcov-report/src/components/MlImageMarkerLayer/index.html +1 -1
  29. package/coverage/lcov-report/src/components/MlLayer/MlLayer.tsx.html +1 -1
  30. package/coverage/lcov-report/src/components/MlLayer/index.html +1 -1
  31. package/coverage/lcov-report/src/components/MlLayerMagnify/MlLayerMagnify.tsx.html +1 -1
  32. package/coverage/lcov-report/src/components/MlLayerMagnify/index.html +1 -1
  33. package/coverage/lcov-report/src/components/MlLayerSwipe/MlLayerSwipe.tsx.html +1 -1
  34. package/coverage/lcov-report/src/components/MlLayerSwipe/index.html +1 -1
  35. package/coverage/lcov-report/src/components/MlLayerSwitcher/MlLayerSwitcher.js.html +1 -1
  36. package/coverage/lcov-report/src/components/MlLayerSwitcher/components/LayerBox.js.html +1 -1
  37. package/coverage/lcov-report/src/components/MlLayerSwitcher/components/index.html +1 -1
  38. package/coverage/lcov-report/src/components/MlLayerSwitcher/index.html +1 -1
  39. package/coverage/lcov-report/src/components/MlMarker/MlMarker.tsx.html +1 -1
  40. package/coverage/lcov-report/src/components/MlMarker/index.html +1 -1
  41. package/coverage/lcov-report/src/components/MlMeasureTool/MlMeasureTool.tsx.html +1 -1
  42. package/coverage/lcov-report/src/components/MlMeasureTool/index.html +1 -1
  43. package/coverage/lcov-report/src/components/MlNavigationCompass/MlNavigationCompass.tsx.html +1 -1
  44. package/coverage/lcov-report/src/components/MlNavigationCompass/index.html +1 -1
  45. package/coverage/lcov-report/src/components/MlNavigationTools/MlNavigationTools.tsx.html +1 -1
  46. package/coverage/lcov-report/src/components/MlNavigationTools/index.html +1 -1
  47. package/coverage/lcov-report/src/components/MlOsmLayer/MlOsmLayer.js.html +1 -1
  48. package/coverage/lcov-report/src/components/MlOsmLayer/MlOsmLayer.stories_.js.html +1 -1
  49. package/coverage/lcov-report/src/components/MlOsmLayer/index.html +1 -1
  50. package/coverage/lcov-report/src/components/MlScaleReference/MlScaleReference.js.html +1 -1
  51. package/coverage/lcov-report/src/components/MlScaleReference/index.html +1 -1
  52. package/coverage/lcov-report/src/components/MlShareMapState/MlShareMapState.js.html +1 -1
  53. package/coverage/lcov-report/src/components/MlShareMapState/index.html +1 -1
  54. package/coverage/lcov-report/src/components/MlSpatialElevationProfile/MlSpatialElevationProfile.js.html +1 -1
  55. package/coverage/lcov-report/src/components/MlSpatialElevationProfile/index.html +1 -1
  56. package/coverage/lcov-report/src/components/MlThreeJsLayer/MlThreeJsLayer.js.html +1 -1
  57. package/coverage/lcov-report/src/components/MlThreeJsLayer/index.html +1 -1
  58. package/coverage/lcov-report/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.tsx.html +1 -1
  59. package/coverage/lcov-report/src/components/MlTransitionGeoJsonLayer/index.html +1 -1
  60. package/coverage/lcov-report/src/components/MlUseMapDebugger/MlUseMapDebugger.js.html +1 -1
  61. package/coverage/lcov-report/src/components/MlUseMapDebugger/index.html +1 -1
  62. package/coverage/lcov-report/src/components/MlVectorTileLayer/MlVectorTileLayer.tsx.html +1 -1
  63. package/coverage/lcov-report/src/components/MlVectorTileLayer/index.html +1 -1
  64. package/coverage/lcov-report/src/components/MlWmsFeatureInfoPopup/MlWmsFeatureInfoPopup.js.html +1 -1
  65. package/coverage/lcov-report/src/components/MlWmsFeatureInfoPopup/index.html +1 -1
  66. package/coverage/lcov-report/src/components/MlWmsLayer/MlWmsLayer.tsx.html +1 -1
  67. package/coverage/lcov-report/src/components/MlWmsLayer/index.html +1 -1
  68. package/coverage/lcov-report/src/components/MlWmsLoader/MlWmsLoader.tsx.html +1 -1
  69. package/coverage/lcov-report/src/components/MlWmsLoader/index.html +1 -1
  70. package/coverage/lcov-report/src/contexts/MapContext.tsx.html +1 -1
  71. package/coverage/lcov-report/src/contexts/SimpleDataContext.js.html +1 -1
  72. package/coverage/lcov-report/src/contexts/SimpleDataProvider.js.html +1 -1
  73. package/coverage/lcov-report/src/contexts/index.html +1 -1
  74. package/coverage/lcov-report/src/hooks/index.html +11 -11
  75. package/coverage/lcov-report/src/hooks/useCameraFollowPath/index.html +116 -0
  76. package/coverage/lcov-report/src/hooks/useCameraFollowPath/useCameraFollowPath.tsx.html +661 -0
  77. package/coverage/lcov-report/src/hooks/useExportMap/index.html +14 -14
  78. package/coverage/lcov-report/src/hooks/useExportMap/index.ts.html +1 -1
  79. package/coverage/lcov-report/src/hooks/useExportMap/lib.ts.html +21 -108
  80. package/coverage/lcov-report/src/hooks/useLayer.ts.html +1 -1
  81. package/coverage/lcov-report/src/hooks/useLayerEvent.js.html +9 -9
  82. package/coverage/lcov-report/src/hooks/useMap.ts.html +1 -1
  83. package/coverage/lcov-report/src/hooks/useMapState.ts.html +1 -1
  84. package/coverage/lcov-report/src/hooks/useSource.ts.html +1 -1
  85. package/coverage/lcov-report/src/hooks/useWms.js.html +1 -1
  86. package/coverage/lcov-report/src/index.html +1 -1
  87. package/coverage/lcov-report/src/index.ts.html +8 -2
  88. package/coverage/lcov.info +222 -72
  89. package/dist/components/MlCreatePdfForm/MlCreatePdfForm.stories.d.ts +1 -0
  90. package/dist/components/MlCreatePdfForm/lib/PdfContext.d.ts +3 -16
  91. package/dist/components/MlCreatePdfForm/lib/PdfPreview.d.ts +19 -6
  92. package/dist/components/MlCreatePdfForm/lib/_PdfPreview.d.ts +13 -0
  93. package/dist/hooks/useCameraFollowPath/useCameraFollowPath.d.ts +35 -0
  94. package/dist/hooks/useCameraFollowPath/useCameraFollowPath.stories.d.ts +17 -0
  95. package/dist/index.d.ts +2 -0
  96. package/dist/index.esm.js +656 -597
  97. package/dist/index.esm.js.map +1 -1
  98. package/package.json +3 -1
  99. package/scripts/build-catalogue-meta.js +1 -1
  100. package/src/components/MlCreatePdfForm/MlCreatePdfForm.stories.tsx +16 -1
  101. package/src/components/MlCreatePdfForm/MlCreatePdfForm.tsx +0 -2
  102. package/src/components/MlCreatePdfForm/lib/PdfContext.tsx +16 -18
  103. package/src/components/MlCreatePdfForm/lib/PdfForm.tsx +80 -7
  104. package/src/components/MlCreatePdfForm/lib/PdfPreview.tsx +285 -357
  105. package/src/components/MlCreatePdfForm/lib/_PdfPreview.tsx +399 -0
  106. package/src/components/MlCreatePdfForm/lib/pdfContext.d.ts +24 -0
  107. package/src/components/MlCreatePdfForm/lib/preview.css +114 -0
  108. package/src/hooks/useCameraFollowPath/useCameraFollowPath.doc.de.md +4 -0
  109. package/src/hooks/useCameraFollowPath/useCameraFollowPath.doc.en.md +1 -0
  110. package/src/hooks/useCameraFollowPath/useCameraFollowPath.meta.json +15 -0
  111. package/src/hooks/useCameraFollowPath/useCameraFollowPath.stories.tsx +198 -0
  112. package/src/hooks/useCameraFollowPath/useCameraFollowPath.tsx +192 -0
  113. package/src/hooks/useExportMap/lib.ts +14 -43
  114. package/src/index.ts +2 -0
package/.eslintignore CHANGED
@@ -8,4 +8,5 @@ docs
8
8
  docs-build
9
9
  js-docs
10
10
  node_modules
11
- storybook-static
11
+ storybook-static
12
+ scripts
package/CHANGELOG.md CHANGED
@@ -1,6 +1,16 @@
1
1
  # Change Log
2
2
 
3
3
 
4
+ ## [v0.1.62] - 2022-11-26
5
+
6
+ ### Added
7
+ - ba36980: full rewrite of the PdfPreview component, fixing distortion issues in lower zoom levels, offering improved user experience when transforming, adding an option to set a fixed scale
8
+
9
+ ## [v0.1.61] - 2022-11-16
10
+
11
+ ### Added
12
+ - 63f11bc: add useCameraFollowPath
13
+
4
14
  ## [v0.1.60] - 2022-11-04
5
15
 
6
16
  ### Fixed
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1667565922268" clover="3.2.0">
3
- <project timestamp="1667565922268" name="All files">
4
- <metrics statements="1776" coveredstatements="641" conditionals="1090" coveredconditionals="313" methods="330" coveredmethods="109" elements="3196" coveredelements="1063" complexity="0" loc="1776" ncloc="1776" packages="35" files="45" classes="45"/>
2
+ <coverage generated="1669458732933" clover="3.2.0">
3
+ <project timestamp="1669458732933" name="All files">
4
+ <metrics statements="1849" coveredstatements="641" conditionals="1132" coveredconditionals="313" methods="343" coveredmethods="109" elements="3324" coveredelements="1063" complexity="0" loc="1849" ncloc="1849" packages="36" files="46" classes="46"/>
5
5
  <package name="src">
6
6
  <metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
7
7
  <file name="index.ts" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/index.ts">
@@ -78,9 +78,9 @@
78
78
  <metrics statements="3" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="0"/>
79
79
  <file name="MlCreatePdfForm.tsx" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/components/MlCreatePdfForm/MlCreatePdfForm.tsx">
80
80
  <metrics statements="3" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="0"/>
81
- <line num="25" count="10" type="stmt"/>
82
- <line num="26" count="0" type="stmt"/>
83
- <line num="36" count="10" type="stmt"/>
81
+ <line num="24" count="10" type="stmt"/>
82
+ <line num="25" count="0" type="stmt"/>
83
+ <line num="34" count="10" type="stmt"/>
84
84
  </file>
85
85
  </package>
86
86
  <package name="src.components.MlFeatureEditor">
@@ -1709,7 +1709,7 @@
1709
1709
  </file>
1710
1710
  </package>
1711
1711
  <package name="src.hooks">
1712
- <metrics statements="223" coveredstatements="101" conditionals="152" coveredconditionals="60" methods="37" coveredmethods="16"/>
1712
+ <metrics statements="223" coveredstatements="99" conditionals="152" coveredconditionals="60" methods="37" coveredmethods="16"/>
1713
1713
  <file name="useLayer.ts" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/hooks/useLayer.ts">
1714
1714
  <metrics statements="63" coveredstatements="47" conditionals="68" coveredconditionals="44" methods="8" coveredmethods="7"/>
1715
1715
  <line num="34" count="13" type="stmt"/>
@@ -1777,9 +1777,9 @@
1777
1777
  <line num="203" count="102" type="stmt"/>
1778
1778
  </file>
1779
1779
  <file name="useLayerEvent.js" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/hooks/useLayerEvent.js">
1780
- <metrics statements="21" coveredstatements="2" conditionals="16" coveredconditionals="0" methods="3" coveredmethods="0"/>
1781
- <line num="6" count="10" type="stmt"/>
1782
- <line num="11" count="10" type="stmt"/>
1780
+ <metrics statements="21" coveredstatements="0" conditionals="16" coveredconditionals="0" methods="3" coveredmethods="0"/>
1781
+ <line num="6" count="0" type="stmt"/>
1782
+ <line num="11" count="0" type="stmt"/>
1783
1783
  <line num="13" count="0" type="stmt"/>
1784
1784
  <line num="14" count="0" type="stmt"/>
1785
1785
  <line num="16" count="0" type="stmt"/>
@@ -1952,8 +1952,99 @@
1952
1952
  <line num="82" count="10" type="stmt"/>
1953
1953
  </file>
1954
1954
  </package>
1955
+ <package name="src.hooks.useCameraFollowPath">
1956
+ <metrics statements="85" coveredstatements="2" conditionals="50" coveredconditionals="0" methods="14" coveredmethods="0"/>
1957
+ <file name="useCameraFollowPath.tsx" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/hooks/useCameraFollowPath/useCameraFollowPath.tsx">
1958
+ <metrics statements="85" coveredstatements="2" conditionals="50" coveredconditionals="0" methods="14" coveredmethods="0"/>
1959
+ <line num="40" count="10" type="stmt"/>
1960
+ <line num="43" count="0" type="stmt"/>
1961
+ <line num="44" count="0" type="stmt"/>
1962
+ <line num="45" count="0" type="stmt"/>
1963
+ <line num="46" count="0" type="stmt"/>
1964
+ <line num="47" count="0" type="stmt"/>
1965
+ <line num="48" count="0" type="stmt"/>
1966
+ <line num="49" count="0" type="stmt"/>
1967
+ <line num="51" count="0" type="cond" truecount="0" falsecount="2"/>
1968
+ <line num="52" count="0" type="stmt"/>
1969
+ <line num="53" count="0" type="cond" truecount="0" falsecount="2"/>
1970
+ <line num="55" count="0" type="stmt"/>
1971
+ <line num="60" count="0" type="stmt"/>
1972
+ <line num="61" count="0" type="stmt"/>
1973
+ <line num="62" count="0" type="cond" truecount="0" falsecount="2"/>
1974
+ <line num="63" count="0" type="stmt"/>
1975
+ <line num="66" count="0" type="stmt"/>
1976
+ <line num="67" count="0" type="cond" truecount="0" falsecount="2"/>
1977
+ <line num="68" count="0" type="stmt"/>
1978
+ <line num="69" count="0" type="cond" truecount="0" falsecount="4"/>
1979
+ <line num="70" count="0" type="stmt"/>
1980
+ <line num="73" count="0" type="stmt"/>
1981
+ <line num="74" count="0" type="cond" truecount="0" falsecount="2"/>
1982
+ <line num="75" count="0" type="stmt"/>
1983
+ <line num="76" count="0" type="cond" truecount="0" falsecount="4"/>
1984
+ <line num="77" count="0" type="stmt"/>
1985
+ <line num="80" count="0" type="stmt"/>
1986
+ <line num="81" count="0" type="stmt"/>
1987
+ <line num="84" count="0" type="stmt"/>
1988
+ <line num="85" count="0" type="cond" truecount="0" falsecount="2"/>
1989
+ <line num="86" count="0" type="stmt"/>
1990
+ <line num="87" count="0" type="stmt"/>
1991
+ <line num="88" count="0" type="stmt"/>
1992
+ <line num="89" count="0" type="stmt"/>
1993
+ <line num="90" count="0" type="stmt"/>
1994
+ <line num="91" count="0" type="stmt"/>
1995
+ <line num="92" count="0" type="stmt"/>
1996
+ <line num="94" count="0" type="stmt"/>
1997
+ <line num="95" count="0" type="cond" truecount="0" falsecount="2"/>
1998
+ <line num="96" count="0" type="stmt"/>
1999
+ <line num="97" count="0" type="stmt"/>
2000
+ <line num="98" count="0" type="stmt"/>
2001
+ <line num="99" count="0" type="stmt"/>
2002
+ <line num="100" count="0" type="stmt"/>
2003
+ <line num="101" count="0" type="stmt"/>
2004
+ <line num="102" count="0" type="stmt"/>
2005
+ <line num="106" count="0" type="cond" truecount="0" falsecount="4"/>
2006
+ <line num="107" count="0" type="stmt"/>
2007
+ <line num="109" count="0" type="cond" truecount="0" falsecount="4"/>
2008
+ <line num="110" count="0" type="stmt"/>
2009
+ <line num="114" count="0" type="stmt"/>
2010
+ <line num="118" count="0" type="cond" truecount="0" falsecount="2"/>
2011
+ <line num="120" count="0" type="cond" truecount="0" falsecount="2"/>
2012
+ <line num="121" count="0" type="stmt"/>
2013
+ <line num="122" count="0" type="cond" truecount="0" falsecount="4"/>
2014
+ <line num="123" count="0" type="stmt"/>
2015
+ <line num="126" count="0" type="stmt"/>
2016
+ <line num="129" count="0" type="cond" truecount="0" falsecount="2"/>
2017
+ <line num="130" count="0" type="stmt"/>
2018
+ <line num="139" count="0" type="cond" truecount="0" falsecount="2"/>
2019
+ <line num="140" count="0" type="stmt"/>
2020
+ <line num="142" count="0" type="stmt"/>
2021
+ <line num="144" count="0" type="stmt"/>
2022
+ <line num="145" count="0" type="stmt"/>
2023
+ <line num="146" count="0" type="stmt"/>
2024
+ <line num="149" count="0" type="stmt"/>
2025
+ <line num="150" count="0" type="stmt"/>
2026
+ <line num="151" count="0" type="stmt"/>
2027
+ <line num="152" count="0" type="stmt"/>
2028
+ <line num="153" count="0" type="stmt"/>
2029
+ <line num="156" count="0" type="stmt"/>
2030
+ <line num="161" count="0" type="cond" truecount="0" falsecount="2"/>
2031
+ <line num="162" count="0" type="stmt"/>
2032
+ <line num="163" count="0" type="stmt"/>
2033
+ <line num="164" count="0" type="stmt"/>
2034
+ <line num="167" count="0" type="stmt"/>
2035
+ <line num="168" count="0" type="cond" truecount="0" falsecount="4"/>
2036
+ <line num="169" count="0" type="stmt"/>
2037
+ <line num="170" count="0" type="stmt"/>
2038
+ <line num="173" count="0" type="stmt"/>
2039
+ <line num="174" count="0" type="stmt"/>
2040
+ <line num="175" count="0" type="cond" truecount="0" falsecount="2"/>
2041
+ <line num="176" count="0" type="stmt"/>
2042
+ <line num="181" count="0" type="stmt"/>
2043
+ <line num="187" count="10" type="stmt"/>
2044
+ </file>
2045
+ </package>
1955
2046
  <package name="src.hooks.useExportMap">
1956
- <metrics statements="57" coveredstatements="1" conditionals="14" coveredconditionals="0" methods="15" coveredmethods="0"/>
2047
+ <metrics statements="45" coveredstatements="1" conditionals="6" coveredconditionals="0" methods="14" coveredmethods="0"/>
1957
2048
  <file name="index.ts" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/hooks/useExportMap/index.ts">
1958
2049
  <metrics statements="7" coveredstatements="0" conditionals="2" coveredconditionals="0" methods="3" coveredmethods="0"/>
1959
2050
  <line num="14" count="0" type="stmt"/>
@@ -1965,57 +2056,45 @@
1965
2056
  <line num="27" count="0" type="stmt"/>
1966
2057
  </file>
1967
2058
  <file name="lib.ts" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/hooks/useExportMap/lib.ts">
1968
- <metrics statements="50" coveredstatements="1" conditionals="12" coveredconditionals="0" methods="12" coveredmethods="0"/>
1969
- <line num="20" count="10" type="stmt"/>
2059
+ <metrics statements="38" coveredstatements="1" conditionals="4" coveredconditionals="0" methods="11" coveredmethods="0"/>
2060
+ <line num="19" count="10" type="stmt"/>
2061
+ <line num="20" count="0" type="stmt"/>
1970
2062
  <line num="21" count="0" type="stmt"/>
1971
- <line num="22" count="0" type="stmt"/>
2063
+ <line num="24" count="0" type="stmt"/>
1972
2064
  <line num="25" count="0" type="stmt"/>
1973
2065
  <line num="26" count="0" type="stmt"/>
1974
2066
  <line num="27" count="0" type="stmt"/>
1975
2067
  <line num="28" count="0" type="stmt"/>
1976
2068
  <line num="29" count="0" type="stmt"/>
1977
2069
  <line num="30" count="0" type="stmt"/>
1978
- <line num="31" count="0" type="stmt"/>
1979
- <line num="33" count="0" type="stmt"/>
2070
+ <line num="32" count="0" type="stmt"/>
2071
+ <line num="35" count="0" type="stmt"/>
1980
2072
  <line num="36" count="0" type="stmt"/>
1981
- <line num="37" count="0" type="stmt"/>
1982
- <line num="39" count="0" type="stmt"/>
1983
- <line num="42" count="0" type="cond" truecount="0" falsecount="2"/>
1984
- <line num="43" count="0" type="stmt"/>
1985
- <line num="49" count="0" type="stmt"/>
1986
- <line num="62" count="0" type="stmt"/>
2073
+ <line num="38" count="0" type="stmt"/>
2074
+ <line num="41" count="0" type="cond" truecount="0" falsecount="2"/>
2075
+ <line num="42" count="0" type="stmt"/>
2076
+ <line num="48" count="0" type="stmt"/>
2077
+ <line num="61" count="0" type="stmt"/>
2078
+ <line num="67" count="0" type="stmt"/>
1987
2079
  <line num="68" count="0" type="stmt"/>
2080
+ <line num="69" count="0" type="stmt"/>
1988
2081
  <line num="71" count="0" type="stmt"/>
1989
- <line num="76" count="0" type="stmt"/>
1990
- <line num="81" count="0" type="stmt"/>
1991
- <line num="83" count="0" type="stmt"/>
1992
- <line num="84" count="0" type="stmt"/>
1993
- <line num="85" count="0" type="stmt"/>
1994
- <line num="86" count="0" type="cond" truecount="0" falsecount="2"/>
1995
- <line num="87" count="0" type="stmt"/>
1996
- <line num="89" count="0" type="cond" truecount="0" falsecount="2"/>
1997
- <line num="90" count="0" type="stmt"/>
1998
- <line num="92" count="0" type="cond" truecount="0" falsecount="2"/>
1999
- <line num="93" count="0" type="stmt"/>
2000
- <line num="95" count="0" type="cond" truecount="0" falsecount="2"/>
2001
- <line num="96" count="0" type="stmt"/>
2002
- <line num="99" count="0" type="stmt"/>
2082
+ <line num="72" count="0" type="stmt"/>
2083
+ <line num="77" count="0" type="stmt"/>
2084
+ <line num="80" count="0" type="stmt"/>
2003
2085
  <line num="100" count="0" type="stmt"/>
2004
- <line num="105" count="0" type="stmt"/>
2086
+ <line num="106" count="0" type="stmt"/>
2005
2087
  <line num="108" count="0" type="stmt"/>
2088
+ <line num="112" count="0" type="stmt"/>
2089
+ <line num="114" count="0" type="stmt"/>
2090
+ <line num="126" count="0" type="stmt"/>
2091
+ <line num="127" count="0" type="stmt"/>
2006
2092
  <line num="129" count="0" type="stmt"/>
2093
+ <line num="132" count="0" type="stmt"/>
2007
2094
  <line num="135" count="0" type="stmt"/>
2008
- <line num="137" count="0" type="stmt"/>
2009
- <line num="141" count="0" type="stmt"/>
2010
- <line num="143" count="0" type="stmt"/>
2011
- <line num="155" count="0" type="stmt"/>
2012
- <line num="156" count="0" type="stmt"/>
2013
- <line num="158" count="0" type="stmt"/>
2014
- <line num="161" count="0" type="stmt"/>
2015
- <line num="164" count="0" type="stmt"/>
2016
- <line num="180" count="0" type="stmt"/>
2017
- <line num="182" count="0" type="stmt"/>
2018
- <line num="183" count="0" type="stmt"/>
2095
+ <line num="151" count="0" type="stmt"/>
2096
+ <line num="153" count="0" type="stmt"/>
2097
+ <line num="154" count="0" type="stmt"/>
2019
2098
  </file>
2020
2099
  </package>
2021
2100
  </project>