Dane Springmeyer
|
d29ae14104
|
make it possible to set the map.maximum_extent back to None/uninitialized from python
|
2012-04-04 12:07:15 -07:00 |
|
Dane Springmeyer
|
46b16c917e
|
support nodata for paletted images and allow user to set nodata on-the-fly - closes #1160 and #1161 - refs #688 and refs #730 and refs #50 and refs #1018
|
2012-04-03 16:06:36 -07:00 |
|
Dane Springmeyer
|
a7e150a593
|
tests: add simple tests for postgis 'bbox' token replacement
|
2012-04-02 19:29:06 -07:00 |
|
Dane Springmeyer
|
d9cb76f7a1
|
postgis: support mixed case table names - closes #1159
|
2012-04-02 19:21:14 -07:00 |
|
Dane Springmeyer
|
10848f9d04
|
postgis: warn in the unlikely case of a numeric primary key
|
2012-04-02 18:13:27 -07:00 |
|
Dane Springmeyer
|
763e84a6e9
|
postgis: add support for auto-detection of primary key field - closes #804 - refs #753
|
2012-04-02 16:20:41 -07:00 |
|
Dane Springmeyer
|
2e76ff1958
|
make stroke property on line_symbolizer a reference when accessed from python (not a copy)
|
2012-04-02 11:57:24 -07:00 |
|
Dane Springmeyer
|
9d1afbbfc6
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2012-03-27 18:56:52 -04:00 |
|
Dane Springmeyer
|
67f6d0f672
|
fixup pycairo rendering test
|
2012-03-27 18:55:33 -04:00 |
|
Dane Springmeyer
|
3f26c439c9
|
fix marker width/height to mean pixels - which it should have all along - closes #1134
|
2012-03-23 20:28:12 -07:00 |
|
Dane Springmeyer
|
46fdc570c2
|
cpp tests for mapnik parameters and mapnik:boolean -refs #1141
|
2012-03-23 20:04:42 -07:00 |
|
Dane Springmeyer
|
ea5a46f230
|
remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing
|
2012-03-23 18:14:14 -07:00 |
|
Dane Springmeyer
|
13189e0a55
|
tests for compositing operations
|
2012-03-23 17:36:37 -07:00 |
|
Dane Springmeyer
|
e9940c6add
|
update osm test now that extent is not hardcoded
|
2012-03-22 16:44:27 -07:00 |
|
Hermann Kraus
|
a84fcdb133
|
Update tests.
Refs #1125.
|
2012-03-19 17:40:51 +01:00 |
|
Dane Springmeyer
|
015f666e9e
|
tests: remove ancient CssParameter holdovers
|
2012-03-13 07:42:33 -07:00 |
|
Dane Springmeyer
|
803447a8d8
|
disable non-critical failing test after reverting shapefile polygon handling - refs #1093
|
2012-02-28 20:18:47 -08:00 |
|
Dane Springmeyer
|
3839dd363f
|
more pep8 for tests
|
2012-02-24 13:15:48 -08:00 |
|
Dane Springmeyer
|
0a37a1591e
|
fixup whitespace with pep8 tricks from https://gist.github.com/1903033
|
2012-02-24 13:13:56 -08:00 |
|
Hermann Kraus
|
d203d56d34
|
Update tests.
|
2012-02-21 10:21:40 +01:00 |
|
Dane Springmeyer
|
7327a646f0
|
fix memory datasource test
|
2012-02-14 15:01:41 -08:00 |
|
Dane Springmeyer
|
da845cfaa3
|
update feature expression test to new feature attr api that will throw if attr is not found
|
2012-02-14 14:57:36 -08:00 |
|
Dane Springmeyer
|
16828ec161
|
use row/col instead of x/y for clearer grid resolution function
|
2012-02-07 13:44:08 -08:00 |
|
Dane Springmeyer
|
b3819633bd
|
fix point WKT format
|
2012-02-01 17:03:31 -08:00 |
|
Dane Springmeyer
|
915addc51d
|
update grid rendering interface to new feature impl
|
2012-02-01 10:43:23 -08:00 |
|
Artem Pavlenko
|
b90de4874c
|
Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
docs/textrendering.gv
include/mapnik/building_symbolizer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_placements.hpp
include/mapnik/text_placements_list.hpp
include/mapnik/text_placements_simple.hpp
include/mapnik/text_processing.hpp
plugins/input/shape/shape_utils.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/cairo_renderer.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/load_map.cpp
src/placement_finder.cpp
src/shield_symbolizer.cpp
src/text_placements.cpp
src/text_processing.cpp
src/text_symbolizer.cpp
tests/visual_tests/clean.sh
tests/visual_tests/test.py
Merge herm/textplacement-merge
|
2012-01-31 11:09:55 +00:00 |
|
Hermann Kraus
|
2d50c840fe
|
Update tests.
|
2012-01-28 19:37:13 +01:00 |
|
Artem Pavlenko
|
d1f16bb227
|
merge textplacement-merge into feature_impl
|
2012-01-26 13:04:08 +00:00 |
|
Dane Springmeyer
|
4cb9aa44b5
|
update tests to python api for features
|
2012-01-24 15:16:40 -08:00 |
|
Dane Springmeyer
|
e542e90fcf
|
get most of the tests passing
|
2012-01-24 00:27:44 -08:00 |
|
Hermann Kraus
|
047cda5d1b
|
Fix some tests.
|
2012-01-20 00:45:15 +01:00 |
|
Hermann Kraus
|
537231f60e
|
Remove glyph symbolizer.
|
2012-01-19 20:34:09 +01:00 |
|
Artem Pavlenko
|
e699ba17cb
|
Merge branch 'master' into feature_impl
|
2012-01-18 07:48:57 -05:00 |
|
Dane Springmeyer
|
425f20fb68
|
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
|
2012-01-17 18:43:01 -05:00 |
|
Dane Springmeyer
|
fb80de8dfe
|
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
|
2012-01-17 18:43:01 -05:00 |
|
Dane Springmeyer
|
820b9a2b25
|
merge master with feature_impl
|
2012-01-17 17:47:27 -05:00 |
|
Dane Springmeyer
|
63891cec15
|
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
|
2012-01-17 01:09:46 -05:00 |
|
Dane Springmeyer
|
b0d0d06564
|
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
|
2012-01-17 01:09:46 -05:00 |
|
Dane Springmeyer
|
acc0d6e302
|
cleanup python datasource api simplifying access to descriptors
|
2012-01-11 20:03:47 -08:00 |
|
Dane Springmeyer
|
2a137908c3
|
cleanup python datasource api simplifying access to descriptors
|
2012-01-11 20:03:47 -08:00 |
|
Dane Springmeyer
|
f83b0edbe5
|
make failing osm plugin test a todo
|
2012-01-05 18:49:41 -08:00 |
|
Dane Springmeyer
|
e649bb42cf
|
make failing osm plugin test a todo
|
2012-01-05 18:49:41 -08:00 |
|
Dane Springmeyer
|
b7c69a8462
|
test cleanup
|
2012-01-05 18:48:20 -08:00 |
|
Dane Springmeyer
|
80d18dedc3
|
test cleanup
|
2012-01-05 18:48:20 -08:00 |
|
Dane Springmeyer
|
fa93ad7de5
|
more wkb/wkt tests
|
2012-01-05 18:26:01 -08:00 |
|
Dane Springmeyer
|
8ce9da421f
|
more wkb/wkt tests
|
2012-01-05 18:26:01 -08:00 |
|
Dane Springmeyer
|
70bb3805e2
|
test wkb collection output to match wkt output
|
2012-01-05 17:30:21 -08:00 |
|
Dane Springmeyer
|
b925c79e4d
|
test wkb collection output to match wkt output
|
2012-01-05 17:30:21 -08:00 |
|
Dane Springmeyer
|
47e5aff668
|
enable tests comparing wkt/wkb output between shapefiles read with shape.input and ogr.input now that shape reading is fixed up
|
2012-01-05 16:46:19 -08:00 |
|
Dane Springmeyer
|
66dcf9f316
|
enable tests comparing wkt/wkb output between shapefiles read with shape.input and ogr.input now that shape reading is fixed up
|
2012-01-05 16:46:19 -08:00 |
|
Dane Springmeyer
|
68e5811491
|
make failing ogr/shape comparison a todo
|
2011-12-22 14:37:32 -08:00 |
|
Dane Springmeyer
|
654f579ac9
|
make failing ogr/shape comparison a todo
|
2011-12-22 14:37:32 -08:00 |
|
Dane Springmeyer
|
84b7d198d4
|
fixup fontset tests
|
2011-12-22 12:48:11 -08:00 |
|
Dane Springmeyer
|
e72330e38c
|
fixup fontset tests
|
2011-12-22 12:48:11 -08:00 |
|
Dane Springmeyer
|
b820cf7807
|
Merge branch 'geometry_cleanup'
|
2011-12-22 12:42:05 -08:00 |
|
Dane Springmeyer
|
323c36db61
|
Merge branch 'geometry_cleanup'
|
2011-12-22 12:42:05 -08:00 |
|
Dane Springmeyer
|
2701f93a04
|
test cleanups
|
2011-12-22 12:41:51 -08:00 |
|
Dane Springmeyer
|
477ac9c4f9
|
test cleanups
|
2011-12-22 12:41:51 -08:00 |
|
Dane Springmeyer
|
62983ef214
|
fix import
|
2011-12-22 12:20:03 -08:00 |
|
Dane Springmeyer
|
cf4315945f
|
fix import
|
2011-12-22 12:20:03 -08:00 |
|
Dane Springmeyer
|
bed779b465
|
tests: maintain python 2.5 support
|
2011-12-22 12:19:40 -08:00 |
|
Dane Springmeyer
|
77cb946f8d
|
tests: maintain python 2.5 support
|
2011-12-22 12:19:40 -08:00 |
|
Dane Springmeyer
|
ddeac9a16d
|
more tests for geometry wkt and wkb io
|
2011-12-21 15:27:53 -08:00 |
|
Dane Springmeyer
|
6d30e8f126
|
more tests for geometry wkt and wkb io
|
2011-12-21 15:27:53 -08:00 |
|
Dane Springmeyer
|
b12498f967
|
add test comparing geometry handling between ogr and shape plugin - currently fails
|
2011-12-21 12:26:03 -08:00 |
|
Dane Springmeyer
|
7b7fc5eb94
|
add test comparing geometry handling between ogr and shape plugin - currently fails
|
2011-12-21 12:26:03 -08:00 |
|
Dane Springmeyer
|
b06a517f02
|
initial map deepcopy test
|
2011-12-20 12:46:35 -08:00 |
|
Dane Springmeyer
|
ec611832ab
|
initial map deepcopy test
|
2011-12-20 12:46:35 -08:00 |
|
Dane Springmeyer
|
2c1f5b6ea7
|
tests for fontsets
|
2011-12-20 12:46:20 -08:00 |
|
Dane Springmeyer
|
2d59f401b5
|
tests for fontsets
|
2011-12-20 12:46:20 -08:00 |
|
Dane Springmeyer
|
58c00c844a
|
test fontset non-existance
|
2011-12-20 12:40:14 -08:00 |
|
Dane Springmeyer
|
94e44fcd62
|
test fontset non-existance
|
2011-12-20 12:40:14 -08:00 |
|
Dane Springmeyer
|
ea1e5cabb7
|
more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809
|
2011-12-16 09:58:09 -08:00 |
|
Dane Springmeyer
|
312e98a869
|
more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809
|
2011-12-16 09:58:09 -08:00 |
|
Dane Springmeyer
|
6aefbd0d99
|
update tests as per #992
|
2011-12-16 07:22:52 -08:00 |
|
Dane Springmeyer
|
90b5cf69cc
|
update tests as per #992
|
2011-12-16 07:22:52 -08:00 |
|
Dane Springmeyer
|
143efad7cd
|
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
|
2011-12-12 15:55:33 -08:00 |
|
Dane Springmeyer
|
0bb1073b3f
|
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
|
2011-12-12 15:55:33 -08:00 |
|
Dane Springmeyer
|
f0241c0170
|
fully spell out parameters on the map object - refs #977
|
2011-12-05 18:05:35 -08:00 |
|
Dane Springmeyer
|
9203639640
|
fully spell out parameters on the map object - refs #977
|
2011-12-05 18:05:35 -08:00 |
|
Dane Springmeyer
|
b78b8e735b
|
add ability to have typed arbitrary parameters in xml - refs #977
|
2011-12-05 14:46:38 -08:00 |
|
Dane Springmeyer
|
9e924bfa11
|
add ability to have typed arbitrary parameters in xml - refs #977
|
2011-12-05 14:46:38 -08:00 |
|
Dane Springmeyer
|
1d30cb5698
|
add basic tests for osm plugin
|
2011-12-05 14:30:18 -08:00 |
|
Dane Springmeyer
|
dbce93669a
|
add basic tests for osm plugin
|
2011-12-05 14:30:18 -08:00 |
|
Dane Springmeyer
|
7c0bceb6de
|
tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792
|
2011-12-05 13:33:37 -08:00 |
|
Dane Springmeyer
|
e3e0755f70
|
tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792
|
2011-12-05 13:33:37 -08:00 |
|
Dane Springmeyer
|
df64c1690c
|
add tests for reading shapefiles via ogr
|
2011-12-05 13:32:37 -08:00 |
|
Dane Springmeyer
|
d836571a8d
|
add tests for reading shapefiles via ogr
|
2011-12-05 13:32:37 -08:00 |
|
Dane Springmeyer
|
75190a7050
|
tests: test sqlite error behavior on non-existant fields - refs #984/#792
|
2011-12-05 13:24:11 -08:00 |
|
Dane Springmeyer
|
1f2a55172e
|
tests: test sqlite error behavior on non-existant fields - refs #984/#792
|
2011-12-05 13:24:11 -08:00 |
|
Dane Springmeyer
|
9cb1c9c7f7
|
tests: ensure shapefile plugin throws if invalid query is made - refs #792
|
2011-12-05 12:17:30 -08:00 |
|
Dane Springmeyer
|
bc63c9b589
|
tests: ensure shapefile plugin throws if invalid query is made - refs #792
|
2011-12-05 12:17:30 -08:00 |
|
Dane Springmeyer
|
0191f9c012
|
tests: ensure postgis plugin throws if invalid query is made - refs #792
|
2011-12-05 12:11:59 -08:00 |
|
Dane Springmeyer
|
9be619cee4
|
tests: ensure postgis plugin throws if invalid query is made - refs #792
|
2011-12-05 12:11:59 -08:00 |
|
Dane Springmeyer
|
37fee4b674
|
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
|
2011-12-05 12:03:38 -08:00 |
|
Dane Springmeyer
|
ddeca1e81e
|
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
|
2011-12-05 12:03:38 -08:00 |
|
Dane Springmeyer
|
8168cf0f96
|
python: fixup mapnik.Path interface (closes #901), add to_wkb method (closes #831), and add tests for both
|
2011-12-02 19:22:04 -08:00 |
|
Dane Springmeyer
|
742fb891e6
|
python: fixup mapnik.Path interface (closes #901), add to_wkb method (closes #831), and add tests for both
|
2011-12-02 19:22:04 -08:00 |
|
Dane Springmeyer
|
e991f3c94e
|
fixup tests around parameters usage
|
2011-12-02 18:00:20 -08:00 |
|
Dane Springmeyer
|
1d408aa485
|
fixup tests around parameters usage
|
2011-12-02 18:00:20 -08:00 |
|
Dane Springmeyer
|
b03ce6e607
|
add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977
|
2011-12-02 17:48:09 -08:00 |
|
Dane Springmeyer
|
60de1c80cd
|
add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977
|
2011-12-02 17:48:09 -08:00 |
|
Dane Springmeyer
|
f108349f56
|
tests: move pickling to separate test
|
2011-12-02 15:21:35 -08:00 |
|
Dane Springmeyer
|
8d3b990fbd
|
tests: move pickling to separate test
|
2011-12-02 15:21:35 -08:00 |
|
Dane Springmeyer
|
4d5623c1d1
|
tests: postgis tests are optional, so be much less verbose if they cannot be automatically run
|
2011-12-02 12:35:31 -08:00 |
|
Dane Springmeyer
|
14327b913d
|
tests: postgis tests are optional, so be much less verbose if they cannot be automatically run
|
2011-12-02 12:35:31 -08:00 |
|
Dane Springmeyer
|
3061ebabae
|
pass on rtree count test if pysqlite3 does not support rtree - refs https://github.com/mapnik/mapnik-packaging/issues/8
|
2011-11-30 19:15:11 -08:00 |
|
Dane Springmeyer
|
4c4e4ab9e9
|
pass on rtree count test if pysqlite3 does not support rtree - refs https://github.com/mapnik/mapnik-packaging/issues/8
|
2011-11-30 19:15:11 -08:00 |
|
Dane Springmeyer
|
c3ebf0e332
|
use tempfile modules to construct temporary paths (which should be compatible with windows)
|
2011-11-29 18:15:25 -08:00 |
|
Dane Springmeyer
|
2037cb0d46
|
use tempfile modules to construct temporary paths (which should be compatible with windows)
|
2011-11-29 18:15:25 -08:00 |
|
Artem Pavlenko
|
b689670ffd
|
switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
|
2011-11-23 11:33:58 +00:00 |
|
Artem Pavlenko
|
14700dba16
|
switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
|
2011-11-23 11:33:58 +00:00 |
|
Dane Springmeyer
|
67871acc28
|
fixup postgis test paths
|
2011-11-20 18:17:51 -08:00 |
|
Dane Springmeyer
|
07178f2864
|
fixup postgis test paths
|
2011-11-20 18:17:51 -08:00 |
|
Dane Springmeyer
|
6038af1926
|
add long overdue postgis tests
|
2011-11-20 16:43:47 -08:00 |
|
Dane Springmeyer
|
bf323b09c6
|
add long overdue postgis tests
|
2011-11-20 16:43:47 -08:00 |
|
Dane Springmeyer
|
0999523b87
|
tests: make the sqlite rtree test more flexible
|
2011-11-19 11:39:59 -08:00 |
|
Dane Springmeyer
|
51c4174b58
|
tests: make the sqlite rtree test more flexible
|
2011-11-19 11:39:59 -08:00 |
|
Dane Springmeyer
|
9bf802daeb
|
tests: enforce existance of rtree
|
2011-11-13 17:00:34 -08:00 |
|
Dane Springmeyer
|
c519a170d7
|
tests: enforce existance of rtree
|
2011-11-13 17:00:34 -08:00 |
|
Dane Springmeyer
|
69606958f9
|
add test for sqlite rtree creating under high ds initialization concurrency
|
2011-11-13 16:42:37 -08:00 |
|
Dane Springmeyer
|
11f1e6755f
|
add test for sqlite rtree creating under high ds initialization concurrency
|
2011-11-13 16:42:37 -08:00 |
|
Dane Springmeyer
|
9022cf8a68
|
tests: warn if no datasources are found
|
2011-11-11 17:03:56 -08:00 |
|
Dane Springmeyer
|
dc1e875cb4
|
tests: warn if no datasources are found
|
2011-11-11 17:03:56 -08:00 |
|
Dane Springmeyer
|
3b554ca308
|
test reading from an empty sqlite db
|
2011-11-09 17:19:05 -08:00 |
|
Dane Springmeyer
|
bc06b31746
|
test reading from an empty sqlite db
|
2011-11-09 17:19:05 -08:00 |
|
Dane Springmeyer
|
19d92371c5
|
sqlite: do not alias geometry field name
|
2011-11-03 19:50:36 -04:00 |
|
Dane Springmeyer
|
b9b50899a6
|
sqlite: do not alias geometry field name
|
2011-11-03 19:50:36 -04:00 |
|
Dane Springmeyer
|
6295501ead
|
csv: back off of null and boolean detection since using strings is more predictable across rows
|
2011-11-02 11:07:59 -04:00 |
|
Dane Springmeyer
|
6c8e4b2de0
|
csv: back off of null and boolean detection since using strings is more predictable across rows
|
2011-11-02 11:07:59 -04:00 |
|
Dane Springmeyer
|
914495920a
|
more csv tests
|
2011-11-01 21:11:41 -04:00 |
|
Dane Springmeyer
|
cc969b1a02
|
more csv tests
|
2011-11-01 21:11:41 -04:00 |
|
Dane Springmeyer
|
6dbb12e52c
|
csv: test for columns that are numbers stored as strings
|
2011-11-01 20:39:27 -04:00 |
|
Dane Springmeyer
|
87da27e7ac
|
csv: test for columns that are numbers stored as strings
|
2011-11-01 20:39:27 -04:00 |
|
Dane Springmeyer
|
7f2d3e09f2
|
csv: handle empty headers, an apparently common situation with large government data
|
2011-11-01 20:33:05 -04:00 |
|
Dane Springmeyer
|
4cec91ff82
|
csv: handle empty headers, an apparently common situation with large government data
|
2011-11-01 20:33:05 -04:00 |
|
Dane Springmeyer
|
ee8ae809f4
|
more robust csv tests
|
2011-10-31 19:08:07 -04:00 |
|
Dane Springmeyer
|
87769b3147
|
more robust csv tests
|
2011-10-31 19:08:07 -04:00 |
|
Dane Springmeyer
|
c5dd523636
|
use nose for equality testing in multi_tile raster tests
|
2011-10-31 14:46:58 -04:00 |
|
Dane Springmeyer
|
07eca56ac8
|
use nose for equality testing in multi_tile raster tests
|
2011-10-31 14:46:58 -04:00 |
|
Dane Springmeyer
|
990b452e8c
|
add csv test runner
|
2011-10-28 21:57:51 -07:00 |
|
Dane Springmeyer
|
607e7b7835
|
add csv test runner
|
2011-10-28 21:57:51 -07:00 |
|
Dane Springmeyer
|
1ac4dd4438
|
break out shapefile tests
|
2011-10-28 17:06:44 -07:00 |
|
Dane Springmeyer
|
dab3dd831d
|
break out shapefile tests
|
2011-10-28 17:06:44 -07:00 |
|
Dane Springmeyer
|
247755df3f
|
ensure the tests can be run even with no datasource plugins
|
2011-10-28 17:06:23 -07:00 |
|
Dane Springmeyer
|
a53c61a0c2
|
ensure the tests can be run even with no datasource plugins
|
2011-10-28 17:06:23 -07:00 |
|
Dane Springmeyer
|
2a2fb7437b
|
more robust tests for feature expressions - refs #933 and #944
|
2011-10-28 11:24:14 +01:00 |
|
Dane Springmeyer
|
670573552a
|
more robust tests for feature expressions - refs #933 and #944
|
2011-10-28 11:24:14 +01:00 |
|
Dane Springmeyer
|
77b50306ee
|
add tests for feature expression bugs - refs #933 and #934
|
2011-10-28 11:24:12 +01:00 |
|
Dane Springmeyer
|
994c2b7c38
|
add tests for feature expression bugs - refs #933 and #934
|
2011-10-28 11:24:12 +01:00 |
|