Skip to content

Commit 0fddfd2

Browse files
author
stephanie
committed
merge
2 parents 1ee8272 + f89d583 commit 0fddfd2

File tree

6 files changed

+214
-60
lines changed

6 files changed

+214
-60
lines changed

‎.cache/v/cache/lastfailed‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"tests/test_SessionFactory.py::test_aSessionFactory[setup4]": true,
3+
"tests/test_SessionFactory.py::test_aSessionFactory[setup5]": true,
4+
"tests/test_SessionFactory.py::test_aSessionFactory[setup6]": true,
5+
"tests/test_connection.py::test_connection[setup2]": true,
6+
"tests/test_connection.py::test_connection[setup3]": true,
7+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createAction": true,
8+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createActionBy": true,
9+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createAffiliation": true,
10+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createDataset": true,
11+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createDatasetResults": true,
12+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createDeploymentAction": true,
13+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createFeatureAction": true,
14+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createMethod": true,
15+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createModel": true,
16+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createOrganization": true,
17+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createPerson": true,
18+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createProcessingLevel": true,
19+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createRelatedModel": true,
20+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createSamplingFeature": true,
21+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createSimulation": true,
22+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createSite": true,
23+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createSpatialReference": true,
24+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createTimeSeriesResult": true,
25+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createTimeSeriesResultValues": true,
26+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createUnit": true,
27+
"tests/test_odm2/test_createservice.py::TestCreateService::()::test_createVariable": true,
28+
"tests/test_odm2/test_model.py::test_cvelevationdatum[setup2]": true,
29+
"tests/test_odm2/test_model.py::test_cvelevationdatum[setup3]": true,
30+
"tests/test_odm2/test_model.py::test_cvsamplingfeatuergeotype[setup2]": true,
31+
"tests/test_odm2/test_model.py::test_cvsamplingfeatuergeotype[setup3]": true,
32+
"tests/test_odm2/test_model.py::test_cvsamplingfeaturetype[setup2]": true,
33+
"tests/test_odm2/test_model.py::test_cvsamplingfeaturetype[setup3]": true,
34+
"tests/test_odm2/test_model.py::test_sampling_feature[setup2]": true,
35+
"tests/test_odm2/test_model.py::test_sampling_feature[setup3]": true,
36+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getAllModels": true,
37+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getAllResults": true,
38+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getAllSamplingFeatures": true,
39+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getAllSimulations": true,
40+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getModelByCode": true,
41+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getRelatedModelsByCode": true,
42+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getRelatedModelsByID": true,
43+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getResultsByID": true,
44+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getResultsBySimulationID": true,
45+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getSamplingFeatureByID": true,
46+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getSimulationByActionID": true,
47+
"tests/test_odm2/test_readservice.py::TestReadService::()::test_getSimulationByName": true
48+
}

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: python
1+
git blanguage: python
22
sudo: required
33
# if the https://travis-ci.org/ODM2/ODM2PythonAPI/requests ever says: missing config
44
# validate at: http://lint.travis-ci.org/

‎Examples/Sample.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
#connect to database
1818
# createconnection (dbtype, servername, dbname, username, password)
1919
# session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
20-
session_factory = dbconnection.createConnection('mysql', 'arroyo.uwrl.usu.edu', 'odm2', 'ODM', 'odm')#mysql
20+
session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
2121
# session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
2222
# session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
2323
# session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/ODM2/usecases/WOF_to_ODM2/ODM2.sqlite', 2.0)
2424

2525

2626

27+
2728
#_session = session_factory.getSession()
2829
read = ReadODM2(session_factory)
2930
create =CreateODM2(session_factory)
@@ -60,7 +61,7 @@
6061
siteFeatures = read.getSamplingFeatures()
6162
# siteFeatures = read.getSamplingFeatures(type='Site')
6263
numSites = len(siteFeatures)
63-
64+
print ("Successful query")
6465
for x in siteFeatures:
6566
print(x.SamplingFeatureCode + ": " + x.SamplingFeatureTypeCV )
6667
except Exception as e:
@@ -69,7 +70,7 @@
6970

7071
# Now get the SamplingFeature object for a SamplingFeature code
7172
try:
72-
sf = read.getSamplingFeatures(code=['USU-LBR-Mendon'])[0]
73+
sf = read.getSamplingFeatures(codes=['USU-LBR-Mendon'])[0]
7374
print(sf)
7475
print("\n-------- Information about an individual SamplingFeature ---------")
7576
print("The following are some of the attributes of a SamplingFeature retrieved using getSamplingFeatureByCode(): \n")

‎odm2api/ODM2/models.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class SamplingFeatures(Base):
279279
index=True)
280280
Elevation_m = Column('elevation_m', Float(53))
281281
ElevationDatumCV = Column('elevationdatumcv', ForeignKey(CVElevationDatum.Name), index=True)
282-
FeatureGeometry = Column('featuregeometry', Geometry) # String(50))#
282+
FeatureGeometry = Column('featuregeometry', String(50))#Geometry) #
283283
FeatureGeometryWKT = Column('featuregeometrywkt', String(50))
284284
# FeatureGeometry = Column('featuregeometry', BLOB) # custom geometry queries
285285
__mapper_args__ = {
@@ -289,30 +289,30 @@ class SamplingFeatures(Base):
289289
(SamplingFeatureTypeCV == "Site", "Site"),
290290
], else_="samplingfeatures"),
291291
'polymorphic_identity':'samplingfeatures',
292-
# 'with_polymorphic':'*'
293-
}
294292

293+
}
295294

296295

297-
def shape(self):
298-
"""
299-
Method name based on shapely shapely.geometry.shape() function.
300-
Returns a shapely geometry object
301-
:return geomshape:
302-
"""
303-
_FeatureGeometry = self.FeatureGeometry
304-
geomshape = None
305-
if _FeatureGeometry is not None:
306-
print _FeatureGeometry
307-
print _FeatureGeometry.geom_wkb
308-
if is_hex(_FeatureGeometry.geom_wkb):
309-
# to parse wkb hex string directly
310-
geomshape = wkb.loads(_FeatureGeometry.geom_wkb, hex=True)
311-
# _FeatureGeometry = GeometryColumn('featuregeometry', Geometry)
312-
else:
313-
geomshape = wkt.loads(str(_FeatureGeometry.geom_wkb))
314296

315-
return geomshape
297+
# def shape(self):
298+
# """
299+
# Method name based on shapely shapely.geometry.shape() function.
300+
# Returns a shapely geometry object
301+
# :return geomshape:
302+
# """
303+
# _FeatureGeometry = self.FeatureGeometry
304+
# geomshape = None
305+
# if _FeatureGeometry is not None:
306+
# print _FeatureGeometry
307+
# print _FeatureGeometry.geom_wkb
308+
# if is_hex(_FeatureGeometry.geom_wkb):
309+
# # to parse wkb hex string directly
310+
# geomshape = wkb.loads(_FeatureGeometry.geom_wkb, hex=True)
311+
# # _FeatureGeometry = GeometryColumn('featuregeometry', Geometry)
312+
# else:
313+
# geomshape = wkt.loads(str(_FeatureGeometry.geom_wkb))
314+
#
315+
# return geomshape
316316

317317
def __repr__(self):
318318
# geom = self.shape()
@@ -327,7 +327,7 @@ def __repr__(self):
327327
self.Elevation_m, self.FeatureGeometryWKT)
328328

329329

330-
GeometryDDL(SamplingFeatures.__table__) # Geoalchemy1
330+
# GeometryDDL(SamplingFeatures.__table__) # Geoalchemy1
331331

332332

333333
class FeatureActions(Base):

‎odm2api/ODM2/services/createService.py‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,97 +24,178 @@ def create(self, values):
2424
self._session.add(values)
2525
self._session.commit()
2626

27+
2728
def createVariable(self, var):
2829
self._session.add(var)
2930
self._session.commit()
31+
<<<<<<< HEAD
32+
=======
33+
self._session.flush()
34+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
3035
return var
3136

3237
def createMethod(self, method):
3338
self._session.add(method)
3439
self._session.commit()
40+
<<<<<<< HEAD
41+
=======
42+
self._session.flush()
43+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
3544
return method
3645

3746
def createProcessingLevel(self, proclevel):
3847
self._session.add(proclevel)
3948
self._session.commit()
49+
<<<<<<< HEAD
50+
=======
51+
self._session.flush()
52+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
4053
return proclevel
4154

4255
def createSamplingFeature(self, samplingfeature):
4356
self._session.add(samplingfeature)
4457
self._session.commit()
58+
<<<<<<< HEAD
59+
=======
60+
self._session.flush()
61+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
4562
return samplingfeature
4663

4764
def createUnit(self, unit):
4865
self._session.add(unit)
4966
self._session.commit()
67+
<<<<<<< HEAD
68+
=======
69+
self._session.flush()
70+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
5071
return unit
5172

5273
def createOrganization(self, org):
5374
self._session.add(org)
5475
self._session.commit()
76+
<<<<<<< HEAD
77+
=======
78+
self._session.flush()
79+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
5580
return org
5681

5782
def createPerson(self, person):
5883
self._session.add(person)
5984
self._session.commit()
85+
<<<<<<< HEAD
86+
=======
87+
self._session.flush()
88+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
6089
return person
6190

6291
def createAffiliation(self, affiliation):
6392
self._session.add(affiliation)
6493
self._session.commit()
94+
<<<<<<< HEAD
95+
=======
96+
self._session.flush()
97+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
6598
return affiliation
6699

67100
def createDataset(self, dataset):
68101
self._session.add(dataset)
69102
self._session.commit()
103+
<<<<<<< HEAD
104+
=======
105+
self._session.flush()
106+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
70107
return dataset
71108

72109
def createDatasetResults(self, datasetresult):
73110
self._session.add(datasetresult)
74111
self._session.commit()
112+
<<<<<<< HEAD
113+
=======
114+
self._session.flush()
115+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
75116
return datasetresult
76117

77118
def createAction(self, action, actionby):
78119
self._session.add(action)
120+
<<<<<<< HEAD
79121
actionby.ActionID = action.ActionID
80122
self._session.add(actionby)
81123
self._session.commit()
82124
return action
83125

126+
=======
127+
self._session.commit()
128+
self._session.flush()
129+
actionby.ActionID = action.ActionID
130+
self._session.add(actionby)
131+
self._session.commit()
132+
return action
133+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
84134

85135
def createRelatedAction(self, relatedaction):
86136
self._session.add(relatedaction)
87137
self._session.commit()
138+
<<<<<<< HEAD
139+
=======
140+
self._session.flush()
141+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
88142
return relatedaction
89143

90144
def createResult(self, result):
91145
self._session.add(result)
92146
self._session.commit()
147+
<<<<<<< HEAD
93148
return result
94149

95150
def createResultValues(self, values):
96151
self._session.add_all(values)
97152
self._session.commit()
98153
return values
154+
=======
155+
self._session.flush()
156+
return result
157+
158+
def createResultValue(self, value):
159+
self._session.add(value)
160+
self._session.commit()
161+
self._session.flush()
162+
return value
163+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
99164

100165
def createSpatialReference(self, spatialref):
101166
self._session.add(spatialref)
102167
self._session.commit()
168+
<<<<<<< HEAD
169+
=======
170+
self._session.flush()
171+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
103172
return spatialref
104173

105174
def createModel(self, model):
106175
self._session.add(model)
107176
self._session.commit()
177+
<<<<<<< HEAD
178+
=======
179+
self._session.flush()
180+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
108181
return model
109182

110183
def createRelatedModel(self, relatedmodel):
111184
self._session.add(relatedmodel)
112185
self._session.commit()
186+
<<<<<<< HEAD
187+
=======
188+
self._session.flush()
189+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
113190
return relatedmodel
114191

115192
def createSimulation(self, simulation):
116193
self._session.add(simulation)
117194
self._session.commit()
195+
<<<<<<< HEAD
196+
=======
197+
self._session.flush()
198+
>>>>>>> f89d58369a7e2cfdc7ac8179af87d1914fbe05df
118199
return simulation
119200

120201
def createTimeSeriesResultValues(self, datavalues):

0 commit comments

Comments
 (0)