Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
dodobas committed Sep 30, 2015
1 parent 3521364 commit 92320ce
Show file tree
Hide file tree
Showing 46 changed files with 7,007 additions and 7,008 deletions.
4 changes: 2 additions & 2 deletions .coveragerc
Expand Up @@ -3,7 +3,7 @@
omit = */migrations/*, api/renderers.py, */__init__.py, */admin.py

[report]
exclude_lines =
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover

Expand All @@ -18,7 +18,7 @@ exclude_lines =
# Don't complain if non-runnable code isn't run:
if 0:
if __name__ == .__main__.:

except ImportError:
^pass$

Expand Down
9 changes: 4 additions & 5 deletions .travis.yml
@@ -1,14 +1,14 @@
notifications:
email: false

language: python

python:
- "2.7"

addons:
postgresql: "9.4"

before_install:
- sudo apt-get install -y libspatialite5 libspatialite-dev
- sudo apt-get install -y python-software-properties
Expand All @@ -19,7 +19,7 @@ before_install:
- sudo apt-get install -y gdal-bin libgdal-dev
- export CPLUS_INCLUDE_PATH=/usr/include/gdal
- export C_INCLUDE_PATH=/usr/include/gdal

before_script:
- psql -U postgres -c "create extension postgis"
- createuser hot --superuser --createdb -U postgres
Expand All @@ -32,4 +32,3 @@ script:
./manage.py test



6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -240,7 +240,7 @@ To update source language (English) for Django templates run:
To update source language for javascript files run:

`python manage.py makemessages -d djangojs -l en`


then, push the new source files to the Transifex service, it will overwrite the current source files

Expand All @@ -259,11 +259,11 @@ or for javascript files:


Once there are some translation updates, pull the latest changes for mapped resources

For a specific language(s):

`tx pull -l fr,hr`

For all languages:

`tx pull`
Expand Down
2,744 changes: 1,372 additions & 1,372 deletions api/hdm_presets.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions api/osm_presets.xml
Expand Up @@ -4812,7 +4812,7 @@
<optional>
<check key="lit" text="Lit" />
</optional>
</item> <!-- Billboard -->
</item> <!-- Billboard -->
</group> <!-- Facilities -->
</group> <!-- Facilities -->
<group name="Sports" icon="styles/standard/sport/soccer.png">
Expand Down Expand Up @@ -8436,7 +8436,7 @@
<preset_link preset_name="Description" />
</item> <!-- Fixme -->
</group> <!-- Annotation -->

<group name="Relations" icon="presets/relations.png">
<item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
Expand Down
2 changes: 1 addition & 1 deletion api/templates/rest_framework/login_base.html
Expand Up @@ -14,7 +14,7 @@
{% block branding %}<h3 style="margin: 0 0 20px;">HOT Export Tool</h3>{% endblock %}
</div>
</div><!-- /row fluid -->

<div class="row-fluid">
<div>
<form action="{% url 'rest_framework:login' %}" role="form" method="post">
Expand Down
46 changes: 23 additions & 23 deletions api/tests/files/Example Transform.sql
@@ -1,6 +1,6 @@
--renommage des tables
ALTER TABLE planet_osm_point RENAME TO old_planet_osm_point;
ALTER TABLE planet_osm_line RENAME TO old_planet_osm_line;
--renommage des tables
ALTER TABLE planet_osm_point RENAME TO old_planet_osm_point;
ALTER TABLE planet_osm_line RENAME TO old_planet_osm_line;
ALTER TABLE planet_osm_polygon RENAME TO old_planet_osm_polygon ;

--creation des nouvelles tables avec colonnes en Francais
Expand Down Expand Up @@ -34,13 +34,13 @@ CREATE TABLE planet_osm_point(
tourisme VARCHAR (80),
velo VARCHAR (80),
voie VARCHAR (80)
);
);

--creation de la colonne spatiale dans la table point
SELECT AddGeometryColumn('planet_osm_point', 'the_geom', 3857, 'POINT', 'XY');
--creation de la colonne spatiale dans la table point
SELECT AddGeometryColumn('planet_osm_point', 'the_geom', 3857, 'POINT', 'XY');

--copie des données de la table source renommée dans la nouvelle
INSERT INTO planet_osm_point (
INSERT INTO planet_osm_point (
the_geom,
acces,
artificiel,
Expand Down Expand Up @@ -69,9 +69,9 @@ INSERT INTO planet_osm_point (
tourisme,
velo,
voie
)
)

SELECT
SELECT
Geometry,
access,
man_made,
Expand Down Expand Up @@ -123,10 +123,10 @@ CREATE TABLE planet_osm_line (
velo VARCHAR (80),
voie VARCHAR (80)
);

SELECT AddGeometryColumn('planet_osm_line', 'the_geom', 3857, 'LINESTRING', 'XY');

INSERT INTO planet_osm_line (
SELECT AddGeometryColumn('planet_osm_line', 'the_geom', 3857, 'LINESTRING', 'XY');

INSERT INTO planet_osm_line (
the_geom,
acces,
artificiel,
Expand All @@ -144,9 +144,9 @@ INSERT INTO planet_osm_line (
sensunique,
tourisme,
velo,
voie
)
SELECT
voie
)
SELECT
Geometry,
access,
man_made,
Expand All @@ -167,7 +167,7 @@ SELECT
highway

FROM old_planet_osm_line ;


CREATE TABLE planet_osm_polygon (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
Expand Down Expand Up @@ -195,7 +195,7 @@ CREATE TABLE planet_osm_polygon (
tourisme VARCHAR (80),
voie VARCHAR (80)
);

SELECT AddGeometryColumn('planet_osm_polygon', 'the_geom', 3857, 'MULTIPOLYGON', 'XY');

INSERT INTO planet_osm_polygon (
Expand Down Expand Up @@ -223,9 +223,9 @@ INSERT INTO planet_osm_polygon (
sport,
tourisme,
voie
)
)

SELECT
SELECT
Geometry,
access,
man_made,
Expand All @@ -250,12 +250,12 @@ SELECT
sport,
tourism,
highway
FROM old_planet_osm_polygon ;

FROM old_planet_osm_polygon ;


DROP TABLE old_planet_osm_point ;
DROP TABLE old_planet_osm_point ;
DROP TABLE old_planet_osm_line ;
DROP TABLE old_planet_osm_polygon ;

--fin
--fin
2 changes: 1 addition & 1 deletion api/tests/files/example_translation.txt
Expand Up @@ -285,7 +285,7 @@ office=architext architecte
office=association association
office=compagnie entreprise
office=educational_institution établissement d'enseignement
office=employment_agency
office=employment_agency
office=estate_agent agence immobilière
office=foundation fondation
office=government administration gouvernementale
Expand Down

0 comments on commit 92320ce

Please sign in to comment.