Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
1
1weather
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
1weather
Commits
119ed138
Commit
119ed138
authored
Jun 28, 2021
by
Shailesh Aher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default moon phase parameter is removed for CurrentWeather model
parent
9037f1af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
CoreDataStorage/CoreDataStorage/Objects/Human/CoreCurrentWeather.swift
+1
-1
OneWeatherCore/OneWeatherCore/ModelObjects/Weather/CurrentWeather.swift
+1
-1
WDTWeatherSource/WDTWeatherSource/WdtSurfaceObservation.swift
+1
-1
No files found.
CoreDataStorage/CoreDataStorage/Objects/Human/CoreCurrentWeather.swift
View file @
119ed138
...
...
@@ -36,7 +36,7 @@ open class CoreCurrentWeather: _CoreCurrentWeather, CoreDataAppModelConvertable
result
.
moonset
=
self
.
moonset
result
.
approximateMoonrise
=
self
.
approximateMoonrise
result
.
moonState
=
try
CoreDataUtils
.
appValueOptional
(
name
:
"moonState"
,
value
:
self
.
moonState
,
in
:
self
)
result
.
moonPhase
=
try
CoreDataUtils
.
appValueOptional
(
name
:
"moonPhase"
,
value
:
self
.
moonPhase
,
in
:
self
)
result
.
moonPhase
=
try
CoreDataUtils
.
appValueOptional
(
name
:
"moonPhase"
,
value
:
self
.
moonPhase
,
in
:
self
)
??
.
unknown
return
result
}
...
...
OneWeatherCore/OneWeatherCore/ModelObjects/Weather/CurrentWeather.swift
View file @
119ed138
...
...
@@ -39,7 +39,7 @@ public struct CurrentWeather: Equatable, Hashable {
public
var
moonState
:
CelestialState
?
=
.
normal
public
var
moonPhase
:
MoonPhase
?
=
.
unknown
public
init
(
lastTimeUpdated
:
Date
,
date
:
Date
,
timeZone
:
TimeZone
,
weekDay
:
WeekDay
,
type
:
WeatherType
=
.
unknown
,
isDay
:
Bool
,
uv
:
Int
?
=
nil
,
minTemp
:
Temperature
?
=
nil
,
maxTemp
:
Temperature
?
=
nil
,
windSpeed
:
WindSpeed
?
=
nil
,
windDirection
:
WindDirection
?
=
nil
,
precipitationProbability
:
Percent
?
=
nil
,
temp
:
Temperature
?
=
nil
,
dewPoint
:
Temperature
?
=
nil
,
apparentTemp
:
Temperature
?
=
nil
,
humidity
:
Percent
?
=
nil
,
visibility
:
Visibility
?
=
nil
,
pressure
:
Pressure
?
=
nil
,
sunrise
:
Date
?
=
nil
,
sunset
:
Date
?
=
nil
,
sunState
:
CelestialState
?
=
.
normal
,
moonrise
:
Date
?
=
nil
,
moonset
:
Date
?
=
nil
,
approximateMoonrise
:
Date
?
=
nil
,
moonState
:
CelestialState
?
=
.
normal
,
moonPhase
:
MoonPhase
?
=
.
unknown
)
{
public
init
(
lastTimeUpdated
:
Date
,
date
:
Date
,
timeZone
:
TimeZone
,
weekDay
:
WeekDay
,
type
:
WeatherType
=
.
unknown
,
isDay
:
Bool
,
uv
:
Int
?
=
nil
,
minTemp
:
Temperature
?
=
nil
,
maxTemp
:
Temperature
?
=
nil
,
windSpeed
:
WindSpeed
?
=
nil
,
windDirection
:
WindDirection
?
=
nil
,
precipitationProbability
:
Percent
?
=
nil
,
temp
:
Temperature
?
=
nil
,
dewPoint
:
Temperature
?
=
nil
,
apparentTemp
:
Temperature
?
=
nil
,
humidity
:
Percent
?
=
nil
,
visibility
:
Visibility
?
=
nil
,
pressure
:
Pressure
?
=
nil
,
sunrise
:
Date
?
=
nil
,
sunset
:
Date
?
=
nil
,
sunState
:
CelestialState
?
=
.
normal
,
moonrise
:
Date
?
=
nil
,
moonset
:
Date
?
=
nil
,
approximateMoonrise
:
Date
?
=
nil
,
moonState
:
CelestialState
?
=
.
normal
,
moonPhase
:
MoonPhase
?
=
nil
)
{
self
.
lastTimeUpdated
=
lastTimeUpdated
self
.
date
=
date
self
.
timeZone
=
timeZone
...
...
WDTWeatherSource/WDTWeatherSource/WdtSurfaceObservation.swift
View file @
119ed138
...
...
@@ -100,7 +100,7 @@ struct WdtSurfaceObservation: Codable {
let
isDay
=
guessIsDay
(
currentDate
:
date
,
context
:
originalLocation
)
var
result
=
CurrentWeather
(
lastTimeUpdated
:
updatedAt
,
date
:
date
,
timeZone
:
timeZone
,
weekDay
:
weekDay
,
isDay
:
isDay
)
var
result
=
CurrentWeather
(
lastTimeUpdated
:
updatedAt
,
date
:
date
,
timeZone
:
timeZone
,
weekDay
:
weekDay
,
isDay
:
isDay
,
moonPhase
:
nil
)
if
let
weatherCode
=
self
.
weatherCode
{
result
.
type
=
WdtWeatherCode
(
rawValue
:
weatherCode
)?
.
toAppModel
()
??
.
unknown
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment